Update CI file

ExpressLRS · Jul 6, 2024 · 56dbbb8 · 56dbbb8
1 parent dca0bf9
commit 56dbbb8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,14 +23,14 @@ jobs:
           cl proxy.c mdns.c -link ws2_32.lib iphlpapi.lib -out:epoxy-win.exe
 
       - name: upload artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
-          name: uploads
+          name: upload-doze
           path: mdns-proxy/epoxy-win.exe
 
   mac:
     name: MacOS build
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -41,9 +41,9 @@ jobs:
           cc -o epoxy-mac proxy.c mdns.c
 
       - name: upload artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
-          name: uploads
+          name: upload-mac
           path: mdns-proxy/epoxy-mac
 
   linux:
@@ -59,7 +59,17 @@ jobs:
           cc -o epoxy-lin proxy.c mdns.c
 
       - name: upload artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
-          name: uploads
+          name: upload-linux
           path: mdns-proxy/epoxy-lin
+
+  merge:
+    runs-on: ubuntu-latest
+    needs: [doze, mac, linux]
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: uploads
+          pattern: upload-*
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -35,13 +35,13 @@ jobs:
             sed -i~ "s/@GITHASH@/$GITHASH/" index.html
       - name: Setup Pages
         if: ${{ github.ref == 'refs/heads/master' }}
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v5
       - name: Configure page artifact
         if: ${{ github.ref == 'refs/heads/master' }}
         run: mv dist _site
       - name: Upload artifact
         if: ${{ github.ref == 'refs/heads/master' }}
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v3
 
   deploy:
     if: ${{ github.ref == 'refs/heads/master' }}
@@ -53,4 +53,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4