Merge branch 'master' into far2l-263

hemnstill · Aug 8, 2024 · 31cb0c6 · 31cb0c6
2 parents 1fcb553 + 6d02602
commit 31cb0c6
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 26 deletions.
diff --git a/.github/workflows/_checks.yml b/.github/workflows/_checks.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     container: python:3.11.4-alpine3.17
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: version tests
         run: |
           python -m unittest discover --start-directory .tools --pattern=*_tests.py
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     container: node:18.16.0-alpine3.18
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: |
           corepack enable && corepack prepare [email protected] --activate
           cd .tools/checks

diff --git a/.github/workflows/build-alpine.yml b/.github/workflows/build-alpine.yml
@@ -18,13 +18,13 @@ jobs:
     runs-on: ubuntu-latest
     container: alpine:${{ inputs.version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: build ${{ inputs.workflow }}-alpine-${{ inputs.toolset }}
         run: |
           apk add --no-cache bash
           ./${{ inputs.workflow }}/build_${{ inputs.toolset }}.sh
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: build-${{ inputs.toolset }}
           path: ./${{ inputs.workflow }}/release/build-${{ inputs.toolset }}.tar.gz
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -18,14 +18,14 @@ jobs:
     runs-on: ubuntu-latest
     container: ubuntu:${{ inputs.version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: build ${{ inputs.workflow }}-ubuntu-${{ inputs.toolset }}
         run: |
           apt update
           apt install -y docker.io
           ./${{ inputs.workflow }}/build_${{ inputs.toolset }}.sh
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: build-${{ inputs.toolset }}
           path: ./${{ inputs.workflow }}/release/build-${{ inputs.toolset }}.tar.gz
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
@@ -18,12 +18,12 @@ jobs:
     runs-on: ubuntu-latest
     container: ubuntu:${{ inputs.version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: build ${{ inputs.workflow }}-ubuntu-${{ inputs.toolset }}
         run: |
           ./${{ inputs.workflow }}/build_${{ inputs.toolset }}.sh
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: build-${{ inputs.toolset }}
           path: ./${{ inputs.workflow }}/release/build-${{ inputs.toolset }}.tar.gz
diff --git a/.github/workflows/build-windows-msbuild.yml b/.github/workflows/build-windows-msbuild.yml
@@ -13,7 +13,7 @@ jobs:
   build-windows:
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Add msbuild to PATH
         uses: microsoft/[email protected]
@@ -27,7 +27,7 @@ jobs:
         run: |
           .tools\busybox.exe sh ${{ inputs.workflow }}\build_${{ inputs.toolset }}.sh
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: build-${{ inputs.toolset }}
           path: ./${{ inputs.workflow }}/release/build-${{ inputs.toolset }}.tar.gz
diff --git a/.github/workflows/build-windows-msys2.yml b/.github/workflows/build-windows-msys2.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: windows-2019
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: msys2/setup-msys2@v2
         with:
@@ -30,7 +30,7 @@ jobs:
         shell:
           msys2 {0}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: build-${{ inputs.toolset }}
           path: ./${{ inputs.workflow }}/release/build-${{ inputs.toolset }}.tar.gz
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -27,12 +27,12 @@ jobs:
         run: |
           vcpkg install ${{ inputs.vcpkg_install }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: build ${{ inputs.workflow }}-windows-${{ inputs.toolset }}
         run: |
           .tools\busybox.exe sh ${{ inputs.workflow }}\build_${{ inputs.toolset }}.sh
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: build-${{ inputs.toolset }}
           path: ./${{ inputs.workflow }}/release/build-${{ inputs.toolset }}.tar.gz
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
       - run: |
           apt update -y
           apt install -y libarchive-tools
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
       - run: ${{ inputs.prepare_body }}
       - uses: ncipollo/release-action@v1
         with:

diff --git a/.github/workflows/test-alpine.yml b/.github/workflows/test-alpine.yml
@@ -18,8 +18,8 @@ jobs:
     container: alpine:${{ inputs.version }}
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.artifact }}
           path: .

diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml
@@ -18,8 +18,8 @@ jobs:
     container: ubuntu:${{ inputs.version }}
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.artifact }}
           path: .

diff --git a/.github/workflows/test-nanoserver.yml b/.github/workflows/test-nanoserver.yml
@@ -15,13 +15,13 @@ jobs:
   test-nanoserver:
     runs-on: windows-2022
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: pull windows container ${{ env.IMAGE_NAME }}
         shell: cmd
         run: |
           docker pull ${{ env.IMAGE_NAME }}
           docker images ${{ env.IMAGE_NAME }}
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.artifact }}
           path: .

diff --git a/.github/workflows/test-ubuntu.yml b/.github/workflows/test-ubuntu.yml
@@ -18,8 +18,8 @@ jobs:
     container: ubuntu:${{ inputs.version }}
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.artifact }}
           path: .

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -12,8 +12,8 @@ jobs:
   test-windows:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.artifact }}
           path: .
@@ -24,7 +24,7 @@ jobs:
           cd ./${{ inputs.workflow }}
           ../.tools/busybox.exe bash ./test_windows.sh
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: test-${{ inputs.artifact }}
           path: ./${{ inputs.workflow }}/test-windows.md