diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 36b7674..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,102 +0,0 @@ -# See: https://circleci.com/docs/2.0/configuration-reference -version: 2.1 - -parameters: - GHA_Actor: - type: string - default: "" - GHA_Action: - type: string - default: "" - GHA_Event: - type: string - default: "" - GHA_Meta: - type: string - default: "" - -orbs: - gh: circleci/github-cli@2.1.1 - rust: circleci/rust@1.6.0 - -jobs: - test: - machine: - image: ubuntu-2004:current - resource_class: arm.medium - steps: - - checkout - - rust/install: - version: nightly - - rust/format: - nightly-toolchain: true - - rust/install - - rust/clippy - - rust/test: - package: --all - package: - machine: - image: ubuntu-2004:current - resource_class: arm.medium - steps: - - checkout - - run: - name: Package scie-jump - command: | - mkdir dist - docker run --rm \ - -v $PWD:/code \ - -w /code \ - rust:1.79.0-alpine3.20 \ - sh -c 'apk add musl-dev && cargo run -p package -- dist' - - persist_to_workspace: - root: dist - paths: - - scie-jump* - integration-test: - machine: - image: ubuntu-2004:current - resource_class: arm.medium - steps: - - checkout - - attach_workspace: - at: dist - - run: - name: Integration Tests - command: examples/run.sh --no-package - release: - docker: - - image: 'cimg/base:stable' - steps: - - gh/setup - - attach_workspace: - at: dist - - run: - name: Upload scie-jump-linux-aarch64 to << pipeline.parameters.GHA_Meta >> Github Release - command: | - gh release upload << pipeline.parameters.GHA_Meta >> dist/scie-jump* --repo a-scie/jump - -workflows: - ci: - jobs: - - test - - package - - integration-test: - requires: - - package - release: - when: << pipeline.parameters.GHA_Action >> - jobs: - - package: - filters: - tags: - only: /^v.*/ - - release: - filters: - tags: - only: /^v.*/ - requires: - - package - context: - - GITHUB_CREDS - diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea915a8..ee3fb3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: matrix: # N.B.: macos-12 is the oldest non-deprecated Intel Mac runner and macos-14 is the oldest # non-deprecated ARM Mac runner. - os: [ubuntu-22.04, macos-12, macos-14, windows-2022] + os: [ubuntu-22.04, linux-arm64, macos-12, macos-14, windows-2022] steps: - uses: actions/checkout@v4 - name: Check Formatting @@ -39,16 +39,20 @@ jobs: - name: Unit Tests run: cargo test --all - name: Build & Package - if: ${{ matrix.os != 'ubuntu-22.04' }} + if: ${{ matrix.os != 'ubuntu-22.04' && matrix.os != 'linux-arm64' }} run: cargo run -p package - name: Build & Package - if: ${{ matrix.os == 'ubuntu-22.04' }} + if: ${{ matrix.os == 'ubuntu-22.04' || matrix.os == 'linux-arm64' }} run: | - mkdir dist docker run --rm \ -v $PWD:/code \ -w /code \ rust:1.79.0-alpine3.20 \ - sh -c 'apk add musl-dev && cargo run -p package' + sh -c " + apk add musl-dev && + addgroup -g $(id -g) build && + adduser -u $(id -u) -G build -D -H build && + su build -c 'cargo run -p package -- dist' + " - name: Integration Tests run: examples/run.sh --no-package diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b6965b0..58030dd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,7 +47,7 @@ jobs: matrix: # N.B.: macos-12 is the oldest non-deprecated Intel Mac runner and macos-14 is the oldest # non-deprecated ARM Mac runner. - os: [ ubuntu-22.04, macos-12, macos-14, windows-2022 ] + os: [ ubuntu-22.04, linux-arm64, macos-12, macos-14, windows-2022 ] environment: Release permissions: id-token: write @@ -60,17 +60,21 @@ jobs: with: ref: ${{ needs.determine-tag.outputs.release-tag }} - name: Package scie-jump ${{ needs.determine-tag.outputs.release-tag }} binary - if: ${{ matrix.os != 'ubuntu-22.04' }} + if: ${{ matrix.os != 'ubuntu-22.04' && matrix.os != 'linux-arm64' }} run: cargo run -p package -- dist - name: Package scie-jump ${{ needs.determine-tag.outputs.release-tag }} binary - if: ${{ matrix.os == 'ubuntu-22.04' }} + if: ${{ matrix.os == 'ubuntu-22.04' || matrix.os == 'linux-arm64' }} run: | - mkdir dist docker run --rm \ -v $PWD:/code \ -w /code \ rust:1.79.0-alpine3.20 \ - sh -c 'apk add musl-dev && cargo run -p package -- dist' + sh -c " + apk add musl-dev && + addgroup -g $(id -g) build && + adduser -u $(id -u) -G build -D -H build && + su build -c 'cargo run -p package -- dist' + " - name: Generate scie-jump ${{ needs.determine-tag.outputs.release-tag }} artifact attestations uses: actions/attest-build-provenance@v1 with: @@ -81,7 +85,7 @@ jobs: with: changelog-file: ${{ github.workspace }}/CHANGES.md version: ${{ needs.determine-tag.outputs.release-version }} - setup-python: ${{ matrix.os != 'macos-13-aarch64' }} + setup-python: ${{ matrix.os != 'linux-arm64' }} - name: Create ${{ needs.determine-tag.outputs.release-tag }} Release uses: softprops/action-gh-release@v2 with: @@ -93,16 +97,3 @@ jobs: files: dist/scie-jump* fail_on_unmatched_files: true discussion_category_name: Announcements - aarch64-release-trigger: - name: Trigger Circle CI Linux aarch64 Github Release - needs: - - determine-tag - - github-release - runs-on: ubuntu-22.04 - steps: - - name: Trigger aarch64 release - uses: CircleCI-Public/trigger-circleci-pipeline-action@v1.2.0 - with: - GHA_Meta: "${{ needs.determine-tag.outputs.release-tag }}" - env: - CCI_TOKEN: ${{ secrets.CCI_TOKEN }} diff --git a/CHANGES.md b/CHANGES.md index 31fa7d3..84fd401 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # Release Notes +## 1.1.1 + +This release fixes missing attestations for Linux ARM64 artifacts. + ## 1.1.0 This release updates various dependencies as well as upgrading to Rust diff --git a/Cargo.lock b/Cargo.lock index 27d4480..2405fc7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -796,7 +796,7 @@ dependencies = [ [[package]] name = "scie-jump" -version = "1.1.0" +version = "1.1.1" dependencies = [ "bstr", "env_logger", diff --git a/Cargo.toml b/Cargo.toml index 33293c5..8a11854 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ members = [ [package] name = "scie-jump" -version = "1.1.0" +version = "1.1.1" description = "The self contained interpreted executable launcher." authors = [ "John Sirois ",