Browse Source

Bump actions/upload-artifact from 3 to 4 (#1046)

* Bump actions/upload-artifact from 3 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* try to fix upload conflict

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Wade Simmons <[email protected]>
dependabot[bot] 1 year ago
parent
commit
aa18d7fa4f
2 changed files with 9 additions and 9 deletions
  1. 3 3
      .github/workflows/release.yml
  2. 6 6
      .github/workflows/test.yml

+ 3 - 3
.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
           mv build/*.tar.gz release
           mv build/*.tar.gz release
 
 
       - name: Upload artifacts
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
         with:
           name: linux-latest
           name: linux-latest
           path: release
           path: release
@@ -55,7 +55,7 @@ jobs:
           mv dist\windows\wintun build\dist\windows\
           mv dist\windows\wintun build\dist\windows\
 
 
       - name: Upload artifacts
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
         with:
           name: windows-latest
           name: windows-latest
           path: build
           path: build
@@ -104,7 +104,7 @@ jobs:
           fi
           fi
 
 
       - name: Upload artifacts
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
         with:
           name: darwin-latest
           name: darwin-latest
           path: ./release/*
           path: ./release/*

+ 6 - 6
.github/workflows/test.yml

@@ -40,10 +40,10 @@ jobs:
     - name: Build test mobile
     - name: Build test mobile
       run: make build-test-mobile
       run: make build-test-mobile
 
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
       with:
-        name: e2e packet flow
-        path: e2e/mermaid/
+        name: e2e packet flow linux-latest
+        path: e2e/mermaid/linux-latest
         if-no-files-found: warn
         if-no-files-found: warn
 
 
   test-linux-boringcrypto:
   test-linux-boringcrypto:
@@ -97,8 +97,8 @@ jobs:
     - name: End 2 end
     - name: End 2 end
       run: make e2evv
       run: make e2evv
 
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
       with:
-        name: e2e packet flow
-        path: e2e/mermaid/
+        name: e2e packet flow ${{ matrix.os }}
+        path: e2e/mermaid/${{ matrix.os }}
         if-no-files-found: warn
         if-no-files-found: warn