From 133b79d7d9b1eeebe38dfb5377e53e8c55f6ec55 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Tue, 10 Dec 2024 17:19:27 +0800 Subject: [PATCH 1/3] fix: macos-12 deprecation --- .github/workflows/integ.yml | 2 +- .github/workflows/main.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integ.yml b/.github/workflows/integ.yml index 99b8b6aa..681fe061 100644 --- a/.github/workflows/integ.yml +++ b/.github/workflows/integ.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: - - macos-12 + - macos-15 - ubuntu-18.04 - windows-2019 emacs-version: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2d5d5ab9..189f586b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,7 @@ jobs: fail-fast: false matrix: os: - - macos-12 + - macos-15 - ubuntu-20.04 - windows-2019 emacs-version: @@ -36,11 +36,11 @@ jobs: include: # XXX: The (os, emacs-version) combination must be different from those from those above, # otherwise GitHub Actions modifies the existing combinations, instead of adding new. - - os: macos-11 + - os: macos-15 emacs-version: '27.2' # Cross build target: aarch64-apple-darwin - - os: macos-11 + - os: macos-15 emacs-version: '28.1' # Cross build target: aarch64-apple-darwin diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b95f11eb..93f9ec74 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,11 +19,11 @@ jobs: # The `os` versions below should be as low as possible, for better compatibility. include: # TODO: Get host platform from rustc instead of specifying it explicitly. - - os: macos-11 + - os: macos-15 emacs-version: '27.2' ext: dylib host: x86_64-apple-darwin - - os: macos-11 + - os: macos-15 emacs-version: '27.2' ext: dylib target: aarch64-apple-darwin @@ -126,7 +126,7 @@ jobs: fail-fast: false matrix: include: - - os: macos-12 + - os: macos-15 emacs-version: '27.2' - os: ubuntu-20.04 emacs-version: '27.2' From fa010776510ec0853ce5aac2f50d6cfe817bfc0e Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Tue, 10 Dec 2024 17:25:06 +0800 Subject: [PATCH 2/3] fix: Emacs 27.x is no longer provides proper binaries --- .github/workflows/main.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 189f586b..5b185eab 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,17 +31,17 @@ jobs: - ubuntu-20.04 - windows-2019 emacs-version: - - '27.2' - - '28.1' + - '28.2' + - '29.4' include: # XXX: The (os, emacs-version) combination must be different from those from those above, # otherwise GitHub Actions modifies the existing combinations, instead of adding new. - os: macos-15 - emacs-version: '27.2' + emacs-version: '28.2' # Cross build target: aarch64-apple-darwin - os: macos-15 - emacs-version: '28.1' + emacs-version: '29.4' # Cross build target: aarch64-apple-darwin runs-on: ${{ matrix.os }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 93f9ec74..8c751194 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,11 +20,11 @@ jobs: include: # TODO: Get host platform from rustc instead of specifying it explicitly. - os: macos-15 - emacs-version: '27.2' + emacs-version: '28.2' ext: dylib host: x86_64-apple-darwin - os: macos-15 - emacs-version: '27.2' + emacs-version: '28.2' ext: dylib target: aarch64-apple-darwin - os: ubuntu-20.04 From aed34099c4a4d95252a2accb28fa0a9e8d818e36 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Tue, 10 Dec 2024 17:25:11 +0800 Subject: [PATCH 3/3] fix: eask link command --- bin/setup | 2 +- bin/setup.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/setup b/bin/setup index 28391068..f47608cf 100755 --- a/bin/setup +++ b/bin/setup @@ -9,6 +9,6 @@ source "$here/env.bash" cd "$PROJECT_ROOT" # XXX: Create the directory because `eask link` doesn't. #mkdir -p "$(eask package-directory)" - eask link tsc core + eask link add tsc core eask install ) diff --git a/bin/setup.ps1 b/bin/setup.ps1 index f4fde09b..7da417ec 100644 --- a/bin/setup.ps1 +++ b/bin/setup.ps1 @@ -6,7 +6,7 @@ try { # XXX: Create the directory because `eask link` doesn't. #$eask_package_dir = ((eask package-directory) | Out-String).Trim() #New-Item -ItemType Directory -Force -Path "$eask_package_dir" - eask link tsc core + eask link add tsc core eask install } finally { Pop-Location