Skip to content

Build arm64-linux binaries in CI #620

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.

Sign up for GitHub

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

Merged
jodavies merged 4 commits into from
May 30, 2025
Merged

Build arm64-linux binaries in CI #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9eb91e7
fix: ensure moebius_ works even when char is unsigned
tueda Feb 8, 2025
066e26f
ci: build arm64-linux binaries
tueda May 30, 2025
e0a1e78
fix(ci): workaround for cache-key conflicts in cache-apt-pkgs-action
tueda May 29, 2025
41966e3
ci: summarize files for distribution
tueda May 30, 2025
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
20 changes: 15 additions & 5 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ jobs:
- {os: ubuntu-24.04, shell: bash, bin: tform}
# To maximize compatibility, we build executables on the oldest
# platforms available.
- {os: ubuntu-24.04-arm, shell: bash, bin: form}
- {os: ubuntu-24.04-arm, shell: bash, bin: tform}
- {os: macos-13, shell: bash, bin: form}
- {os: macos-13, shell: bash, bin: tform}
# The macos-14 runner image is based on the arm64 architecture.
Expand All @@ -79,7 +81,9 @@ jobs:
uses: awalsh128/cache-apt-pkgs-action@v1
with:
packages: libmpfr-dev libzstd-dev
version: 1.0
# We need to handle a bug that may cause cache key conflicts.
# See: https://github.com/awalsh128/cache-apt-pkgs-action/pull/150
version: ${{ runner.arch }}-1.0

- name: Install dependencies (Windows)
if: runner.os == 'Windows'
Expand Down Expand Up @@ -371,13 +375,19 @@ jobs:
rm -rf $pkgname
fi
}
make_tar_gz x86_64-linux '*-ubuntu-*/*form'
make_tar_gz x86_64-linux '*-ubuntu-24.04/*form'
make_tar_gz arm64-linux '*-ubuntu-24.04-arm/*form'
make_tar_gz x86_64-osx '*-macos-13/*form'
make_tar_gz arm64-osx '*-macos-14/*form'
make_zip x86_64-windows '*-windows-*/*form.exe'
make_zip x86_64-windows '*-windows-2019/*form.exe'

- name: Print distributions
run: ls -l dist
- name: Summarize files for distribution
run: |
echo "Number of files: $(ls -1 dist | wc -l)" >> $GITHUB_STEP_SUMMARY
echo '' >> $GITHUB_STEP_SUMMARY
echo '| File Name | Size (bytes) |' >> $GITHUB_STEP_SUMMARY
echo '| --- | ---: |' >> $GITHUB_STEP_SUMMARY
ls -l dist | tail -n +2 | awk '{ printf "| %s | %s |\n", $9, $5 }' >> $GITHUB_STEP_SUMMARY

# Upload the distributions as an artifact, regardless of whether
# the commit has a versioning tag. This makes checking and debugging easy.
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ jobs:
uses: awalsh128/cache-apt-pkgs-action@v1
with:
packages: libmpfr-dev libzstd-dev
version: 1.0
# We need to handle a bug that may cause cache key conflicts.
# See: https://github.com/awalsh128/cache-apt-pkgs-action/pull/150
version: ${{ runner.arch }}-1.0

- name: Install MPI if necessary
if: matrix.bin == 'parform' || matrix.bin == 'parvorm'
Expand Down Expand Up @@ -136,7 +138,9 @@ jobs:
uses: awalsh128/cache-apt-pkgs-action@v1
with:
packages: libmpfr-dev libzstd-dev valgrind
version: 1.0
# We need to handle a bug that may cause cache key conflicts.
# See: https://github.com/awalsh128/cache-apt-pkgs-action/pull/150
version: ${{ runner.arch }}-1.0

- name: Configure
run: |
Expand Down Expand Up @@ -180,7 +184,9 @@ jobs:
uses: awalsh128/cache-apt-pkgs-action@v1
with:
packages: lcov libmpfr-dev libzstd-dev
version: 1.0
# We need to handle a bug that may cause cache key conflicts.
# See: https://github.com/awalsh128/cache-apt-pkgs-action/pull/150
version: ${{ runner.arch }}-1.0

- name: Configure
run: |
Expand Down
4 changes: 2 additions & 2 deletions sources/reken.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3729,7 +3729,7 @@ WORD Moebius(PHEAD WORD nn)
{
WORD i,n = nn, x;
LONG newsize;
char *newtable, mu;
SBYTE *newtable, mu;
#if ( BITSINWORD == 32 )
if ( AR.notfirstprime == 0 ) StartPrimeList(BHEAD0);
#endif
Expand All @@ -3742,7 +3742,7 @@ WORD Moebius(PHEAD WORD nn)
if ( AR.moebiustablesize <= 0 ) { newsize = (LONG)nn + 20; }
else { newsize = (LONG)nn*2; }
if ( newsize > MAXPOSITIVE ) newsize = MAXPOSITIVE;
newtable = (char *)Malloc1(newsize*sizeof(char),"Moebius");
newtable = (SBYTE *)Malloc1(newsize*sizeof(SBYTE),"Moebius");
for ( i = 0; i < AR.moebiustablesize; i++ ) newtable[i] = AR.moebiustable[i];
for ( ; i < newsize; i++ ) newtable[i] = 2;
if ( AR.moebiustablesize > 0 ) M_free(AR.moebiustable,"Moebius");
Expand Down
2 changes: 1 addition & 1 deletion sources/structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2037,7 +2037,7 @@ struct R_const {
WORD *CompressPointer; /* (R) */
COMPAREDUMMY CompareRoutine;
ULONG *wranfia;
char *moebiustable;
SBYTE *moebiustable;

LONG OldTime; /* (R) Zero time. Needed in timer. */
LONG InInBuf; /* (R) Characters in input buffer. Scratch files. */
Expand Down