diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1dcf81f..bc999c7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,8 +36,7 @@ jobs: if: inputs.version != 'nobump' run: | cargo install cargo-release - # CR erodkin: commented out execute to have dry run for testing, revert before release - cargo release version ${{ inputs.version }} --no-confirm #--execute --no-confirm + cargo release version ${{ inputs.version }} --execute --no-confirm - name: Which Version id: which_version @@ -93,9 +92,6 @@ jobs: - name: Build run: | cargo build --release --target=${{ matrix.target }} - - name: Test - run: | - echo "test" > builds/test.txt - name: Copy run: | cp target/${{ matrix.target }}/release/libviam_rust_utils.dylib builds/libviam_rust_utils-${{ matrix.platform }}.dylib @@ -106,8 +102,8 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: builds - path: builds + name: builds-${{ matrix.platform }} + path: builds/* build_linux: if: github.repository_owner == 'viamrobotics' @@ -127,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:20.04 runs-on: buildjet-4vcpu-ubuntu-2204 - target: x86_64-unknown-linux-musl platform: musllinux_x86_64 @@ -201,12 +197,22 @@ jobs: cp target/${{ matrix.target }}/release/libviam_rust_utils.a builds/libviam_rust_utils-${{ matrix.platform }}.a - name: Upload artifacts uses: actions/upload-artifact@v4 + with: + 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 - path: builds + pattern: builds-* release: - needs: [prepare, build_macos, build_linux] + needs: [prepare, merge] if: github.repository_owner == 'viamrobotics' runs-on: ubuntu-latest