From 2d93c3dbeba26dccc0841c6e8d707ecd7c84911a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 22:42:51 +0000 Subject: [PATCH 1/8] Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.1.7. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4.1.7) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8817e1e..b1ce9a8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -207,7 +207,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4.1.7 - name: Release uses: softprops/action-gh-release@v1 From df43a03087603092eb56528fe2dbbffa70c2aaca Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 8 Oct 2024 17:21:17 -0400 Subject: [PATCH 2/8] v4 --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b1ce9a8..3ca5531 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -196,7 +196,7 @@ jobs: cp target/${{ matrix.target }}/release/libviam_rust_utils.so builds/libviam_rust_utils-${{ matrix.platform }}.so cp target/${{ matrix.target }}/release/libviam_rust_utils.a builds/libviam_rust_utils-${{ matrix.platform }}.a - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: builds path: builds @@ -207,7 +207,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v4.1.7 + - uses: actions/download-artifact@v4 - name: Release uses: softprops/action-gh-release@v1 From 6882eb1927e66a8ab3859588c04b8d8a5002d6df Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 8 Oct 2024 17:56:16 -0400 Subject: [PATCH 3/8] Try uploading directory --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3ca5531..c9b8461 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -199,7 +199,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: builds - path: builds + path: builds/* release: needs: [prepare, build_macos, build_linux] From b39512c43141dfe188a2380f27ba52be44f530bc Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 8 Oct 2024 18:22:27 -0400 Subject: [PATCH 4/8] Add merge step --- .github/workflows/release.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c9b8461..fef8869 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -198,9 +198,19 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: builds + name: builds-${{ matrix.platform }} path: builds/* + merge: + needs: [build_macos, build_linux] + runs-on: ubuntu-latest + steps: + - name: Merge artifacts + uses: actions/upload-artifact/merge@v4 + with: + name: builds + pattern: builds-* + release: needs: [prepare, build_macos, build_linux] if: github.repository_owner == 'viamrobotics' From f2d6b44617745d7632aca0d6c718a591520241d7 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 8 Oct 2024 18:35:50 -0400 Subject: [PATCH 5/8] needs merge step --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fef8869..548bd85 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -212,7 +212,7 @@ jobs: pattern: builds-* release: - needs: [prepare, build_macos, build_linux] + needs: [prepare, merge] if: github.repository_owner == 'viamrobotics' runs-on: ubuntu-latest From a8daa032368333f50f9eed9ae2f873da9a348d77 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 8 Oct 2024 18:49:10 -0400 Subject: [PATCH 6/8] merge macos --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 548bd85..674957b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -100,10 +100,10 @@ jobs: run: | install_name_tool -id "@rpath/libviam_rust_utils.dylib" builds/libviam_rust_utils-${{ matrix.platform }}.dylib - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: builds - path: builds + name: builds-${{ matrix.platform }} + path: builds/* build_linux: if: github.repository_owner == 'viamrobotics' From 6e68a87065cbb8e03bd737874870eea03820b680 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 8 Oct 2024 19:11:24 -0400 Subject: [PATCH 7/8] Try ubunut:18.04 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 674957b..8e0f810 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -123,7 +123,7 @@ jobs: runs-on: buildjet-8vcpu-ubuntu-2204-arm - target: x86_64-unknown-linux-gnu platform: linux_x86_64 - image: ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main-centos + image: ubuntu:18.04 runs-on: buildjet-4vcpu-ubuntu-2204 - target: x86_64-unknown-linux-musl platform: musllinux_x86_64 From 7144b7387708a0d9b64bfdda6ae3afdae6912f43 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Wed, 9 Oct 2024 12:03:19 -0400 Subject: [PATCH 8/8] Try ubuntu 20.04 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8e0f810..c2e3294 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -123,7 +123,7 @@ jobs: runs-on: buildjet-8vcpu-ubuntu-2204-arm - target: x86_64-unknown-linux-gnu platform: linux_x86_64 - image: ubuntu:18.04 + image: ubuntu:20.04 runs-on: buildjet-4vcpu-ubuntu-2204 - target: x86_64-unknown-linux-musl platform: musllinux_x86_64