Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing Linux ARM64 attestations. #196

Merged
merged 1 commit into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 0 additions & 92 deletions .circleci/config.yml

This file was deleted.

14 changes: 9 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -39,14 +39,18 @@ 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 cmake make musl-dev perl && cargo run -p package -- dist'
sh -c "
apk add cmake make musl-dev perl &&
addgroup -g $(id -g) build &&
adduser -u $(id -u) -G build -D -H build &&
su build -c 'cargo run -p package -- dist'
"
29 changes: 10 additions & 19 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -60,17 +60,21 @@ jobs:
with:
ref: ${{ needs.determine-tag.outputs.release-tag }}
- name: Package ptex ${{ 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
- name: Package ptex ${{ 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 cmake make musl-dev perl && cargo run -p package -- dist'
sh -c "
apk add cmake make musl-dev perl &&
addgroup -g $(id -g) build &&
adduser -u $(id -u) -G build -D -H build &&
su build -c 'cargo run -p package -- dist'
"
- name: Generate ptex ${{ needs.determine-tag.outputs.release-tag }} artifact attestations
uses: actions/attest-build-provenance@v1
with:
Expand All @@ -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:
Expand All @@ -93,16 +97,3 @@ jobs:
files: dist/ptex*
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/[email protected]
with:
GHA_Meta: "${{ needs.determine-tag.outputs.release-tag }}"
env:
CCI_TOKEN: ${{ secrets.CCI_TOKEN }}
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ members = [

[package]
name = "ptex"
version = "1.1.0"
version = "1.1.1"
edition = "2021"
authors = [
"John Sirois <[email protected]>",
Expand Down