Skip to content

Commit dc0d268

Browse files
authored
Merge pull request #536 from iory/ga
Replace deprecated macos-13 with macos-15-intel for x86_64 testing
2 parents 1c76a5c + d233d3c commit dc0d268

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.github/workflows/config.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,11 @@ jobs:
203203
matrix:
204204
include:
205205
# https://github.com/actions/runner-images/tree/main/images/macos
206-
# Note: To test macOS-x with Intel architecture,
207-
# you need to use the paid macOS-x-large runner, as macOS-x is grouped with ARM-based runners.
208-
# https://docs.github.com/en/actions/concepts/runners/about-larger-runners
209-
- runs-on: macos-13 # Intel (x64)
206+
# Note: macos-13 is deprecated and will be retired by December 4, 2025
207+
# https://github.blog/changelog/2025-09-19-github-actions-macos-13-runner-image-is-closing-down/
208+
# Using macos-15-intel for Intel x86_64 architecture testing
209+
# macos-latest (ARM-based Apple Silicon) for general testing
210+
- runs-on: macos-15-intel # Intel (x64) - replacement for deprecated macos-13
210211
- runs-on: macos-14 # ARM64 (Apple Silicon)
211212
- runs-on: macos-15 # ARM64 (Apple Silicon)
212213
fail-fast: false

.travis.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ if [[ "$QEMU" != "" ]]; then
9898
export GIT_SSL_NO_VERIFY=1
9999
git clone http://salsa.debian.org/science-team/euslisp /tmp/euslisp-dfsg
100100
for file in $(cat /tmp/euslisp-dfsg/debian/patches/series); do
101-
# skip patches already applied by https://github.com/euslisp/EusLisp/pull/482, https://github.com/euslisp/EusLisp/pull/511, https://github.com/euslisp/EusLisp/pull/522, https://github.com/euslisp/EusLisp/pull/523, https://github.com/euslisp/EusLisp/pull/524, https://github.com/euslisp/EusLisp/pull/525
102-
[[ $file =~ use-rtld-global-loadelf.patch|fix-arm-ldflags.patch|fix-library-not-linked-against-libc.patch|fix-manpage-has-bad-whatis-entry-on-man-pages.patch|fix-jpegmemcd-compile-error.patch|install-bin-lib-man-to-destdir.patch|install-eusjpeg-lib.patch|fix-lintian-typo.patch|fix-makefile-linux-MACHINE.patch|fix-makefile-generic1-version.patch|fix-localtime-arm32.patch|fix-ppc64el-test.patch|fix-for-blhc.patch|remove-libeus-link-from-exe.patch|load-lib-from-eusdir-arch-lib.patch|fix-for-hardening.patch ]] && continue;
101+
# skip patches already applied by https://github.com/euslisp/EusLisp/pull/482, https://github.com/euslisp/EusLisp/pull/511, https://github.com/euslisp/EusLisp/pull/522, https://github.com/euslisp/EusLisp/pull/523, https://github.com/euslisp/EusLisp/pull/524, https://github.com/euslisp/EusLisp/pull/525, https://github.com/euslisp/EusLisp/pull/534
102+
[[ $file =~ use-rtld-global-loadelf.patch|fix-arm-ldflags.patch|fix-library-not-linked-against-libc.patch|fix-manpage-has-bad-whatis-entry-on-man-pages.patch|fix-jpegmemcd-compile-error.patch|install-bin-lib-man-to-destdir.patch|install-eusjpeg-lib.patch|fix-lintian-typo.patch|fix-makefile-linux-MACHINE.patch|fix-makefile-generic1-version.patch|fix-localtime-arm32.patch|fix-ppc64el-test.patch|fix-for-blhc.patch|remove-libeus-link-from-exe.patch|load-lib-from-eusdir-arch-lib.patch|fix-for-hardening.patch|fix-arm32.patch ]] && continue;
103103
# skip patch already applied by https://github.com/euslisp/EusLisp/pull/441, https://github.com/euslisp/EusLisp/pull/509, https://github.com/euslisp/EusLisp/pull/512, https://github.com/euslisp/EusLisp/pull/514, https://github.com/euslisp/EusLisp/pull/517
104104
if [[ $file =~ fix-for-reprotest.patch ]]; then
105105
filterdiff -p1 -x 'lisp/image/jpeg/makefile' -x 'lisp/l/common.l' -x 'lisp/comp/comp.l' < /tmp/euslisp-dfsg/debian/patches/$file > /tmp/euslisp-dfsg/debian/patches/$file-fix

0 commit comments

Comments
 (0)