From 742f85a9edfcaaa5e7c7b22864cdff84884c9dd0 Mon Sep 17 00:00:00 2001 From: Iori Yanokura Date: Sat, 4 Oct 2025 21:32:09 +0900 Subject: [PATCH 1/2] Replace deprecated macos-13 with macos-15-intel for x86_64 testing - macos-13 will be retired by December 4, 2025 Reference: https://github.blog/changelog/2025-09-19-github-actions-macos-13-runner-image-is-closing-down/ --- .github/workflows/config.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 02915004c..2bf578a78 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -203,10 +203,11 @@ jobs: matrix: include: # https://github.com/actions/runner-images/tree/main/images/macos - # Note: To test macOS-x with Intel architecture, - # you need to use the paid macOS-x-large runner, as macOS-x is grouped with ARM-based runners. - # https://docs.github.com/en/actions/concepts/runners/about-larger-runners - - runs-on: macos-13 # Intel (x64) + # Note: macos-13 is deprecated and will be retired by December 4, 2025 + # https://github.blog/changelog/2025-09-19-github-actions-macos-13-runner-image-is-closing-down/ + # Using macos-15-intel for Intel x86_64 architecture testing + # macos-latest (ARM-based Apple Silicon) for general testing + - runs-on: macos-15-intel # Intel (x64) - replacement for deprecated macos-13 - runs-on: macos-14 # ARM64 (Apple Silicon) - runs-on: macos-15 # ARM64 (Apple Silicon) fail-fast: false From d233d3c1ec47e4c5c2e9f6e81a4f0e4291962858 Mon Sep 17 00:00:00 2001 From: Kei Date: Wed, 8 Oct 2025 17:32:29 +0900 Subject: [PATCH 2/2] skip patch already applied, by https://github.com/euslisp/EusLisp/pull/534 --- .travis.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.sh b/.travis.sh index add50c0bc..4be0b42b4 100755 --- a/.travis.sh +++ b/.travis.sh @@ -98,8 +98,8 @@ if [[ "$QEMU" != "" ]]; then export GIT_SSL_NO_VERIFY=1 git clone http://salsa.debian.org/science-team/euslisp /tmp/euslisp-dfsg for file in $(cat /tmp/euslisp-dfsg/debian/patches/series); do - # 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 - [[ $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; + # 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 + [[ $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; # 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 if [[ $file =~ fix-for-reprotest.patch ]]; then 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