Skip to content

Commit 52b84f1

Browse files
authored
Fix missing Linux ARM64 attestations. (#196)
1 parent 07fe208 commit 52b84f1

File tree

6 files changed

+25
-118
lines changed

6 files changed

+25
-118
lines changed

.circleci/config.yml

-92
This file was deleted.

.github/workflows/ci.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
matrix:
2828
# N.B.: macos-12 is the oldest non-deprecated Intel Mac runner and macos-14 is the oldest
2929
# non-deprecated ARM Mac runner.
30-
os: [ubuntu-22.04, macos-12, macos-14, windows-2022]
30+
os: [ubuntu-22.04, linux-arm64, macos-12, macos-14, windows-2022]
3131
steps:
3232
- uses: actions/checkout@v4
3333
- name: Check Formatting
@@ -39,14 +39,18 @@ jobs:
3939
- name: Unit Tests
4040
run: cargo test --all
4141
- name: Build & Package
42-
if: ${{ matrix.os != 'ubuntu-22.04' }}
42+
if: ${{ matrix.os != 'ubuntu-22.04' && matrix.os != 'linux-arm64' }}
4343
run: cargo run -p package
4444
- name: Build & Package
45-
if: ${{ matrix.os == 'ubuntu-22.04' }}
45+
if: ${{ matrix.os == 'ubuntu-22.04' || matrix.os == 'linux-arm64' }}
4646
run: |
47-
mkdir dist
4847
docker run --rm \
4948
-v $PWD:/code \
5049
-w /code \
5150
rust:1.79.0-alpine3.20 \
52-
sh -c 'apk add cmake make musl-dev perl && cargo run -p package -- dist'
51+
sh -c "
52+
apk add cmake make musl-dev perl &&
53+
addgroup -g $(id -g) build &&
54+
adduser -u $(id -u) -G build -D -H build &&
55+
su build -c 'cargo run -p package -- dist'
56+
"

.github/workflows/release.yml

+10-19
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
matrix:
4848
# N.B.: macos-12 is the oldest non-deprecated Intel Mac runner and macos-14 is the oldest
4949
# non-deprecated ARM Mac runner.
50-
os: [ ubuntu-22.04, macos-12, macos-14, windows-2022 ]
50+
os: [ ubuntu-22.04, linux-arm64, macos-12, macos-14, windows-2022 ]
5151
environment: Release
5252
permissions:
5353
id-token: write
@@ -60,17 +60,21 @@ jobs:
6060
with:
6161
ref: ${{ needs.determine-tag.outputs.release-tag }}
6262
- name: Package ptex ${{ needs.determine-tag.outputs.release-tag }} binary
63-
if: ${{ matrix.os != 'ubuntu-22.04' }}
63+
if: ${{ matrix.os != 'ubuntu-22.04' && matrix.os != 'linux-arm64' }}
6464
run: cargo run -p package
6565
- name: Package ptex ${{ needs.determine-tag.outputs.release-tag }} binary
66-
if: ${{ matrix.os == 'ubuntu-22.04' }}
66+
if: ${{ matrix.os == 'ubuntu-22.04' || matrix.os == 'linux-arm64' }}
6767
run: |
68-
mkdir dist
6968
docker run --rm \
7069
-v $PWD:/code \
7170
-w /code \
7271
rust:1.79.0-alpine3.20 \
73-
sh -c 'apk add cmake make musl-dev perl && cargo run -p package -- dist'
72+
sh -c "
73+
apk add cmake make musl-dev perl &&
74+
addgroup -g $(id -g) build &&
75+
adduser -u $(id -u) -G build -D -H build &&
76+
su build -c 'cargo run -p package -- dist'
77+
"
7478
- name: Generate ptex ${{ needs.determine-tag.outputs.release-tag }} artifact attestations
7579
uses: actions/attest-build-provenance@v1
7680
with:
@@ -81,7 +85,7 @@ jobs:
8185
with:
8286
changelog-file: ${{ github.workspace }}/CHANGES.md
8387
version: ${{ needs.determine-tag.outputs.release-version }}
84-
setup-python: ${{ matrix.os != 'macos-13-aarch64' }}
88+
setup-python: ${{ matrix.os != 'linux-arm64' }}
8589
- name: Create ${{ needs.determine-tag.outputs.release-tag }} Release
8690
uses: softprops/action-gh-release@v2
8791
with:
@@ -93,16 +97,3 @@ jobs:
9397
files: dist/ptex*
9498
fail_on_unmatched_files: true
9599
discussion_category_name: Announcements
96-
aarch64-release-trigger:
97-
name: Trigger Circle CI Linux aarch64 Github Release
98-
needs:
99-
- determine-tag
100-
- github-release
101-
runs-on: ubuntu-22.04
102-
steps:
103-
- name: Trigger aarch64 release
104-
uses: CircleCI-Public/trigger-circleci-pipeline-action@v1.2.0
105-
with:
106-
GHA_Meta: "${{ needs.determine-tag.outputs.release-tag }}"
107-
env:
108-
CCI_TOKEN: ${{ secrets.CCI_TOKEN }}

CHANGES.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Release Notes
22

3+
## 1.1.1
4+
5+
This release fixes missing attestations for Linux ARM64 artifacts.
6+
37
## 1.1.0
48

59
This release updates various dependencies as well as upgrading to Rust

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ members = [
55

66
[package]
77
name = "ptex"
8-
version = "1.1.0"
8+
version = "1.1.1"
99
edition = "2021"
1010
authors = [
1111
"John Sirois <john.sirois@gmail.com>",

0 commit comments

Comments
 (0)