Skip to content

Commit

Permalink
fix: macos-12 deprecation (#289)
Browse files Browse the repository at this point in the history
* fix: macos-12 deprecation

* fix: Emacs 27.x is no longer provides proper binaries

* fix: eask link command
  • Loading branch information
jcs090218 authored Dec 10, 2024
1 parent 02fe7b8 commit cc12de3
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
os:
- macos-12
- macos-15
- ubuntu-18.04
- windows-2019
emacs-version:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@ jobs:
fail-fast: false
matrix:
os:
- macos-12
- macos-15
- 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-11
emacs-version: '27.2'
- os: macos-15
emacs-version: '28.2'
# Cross build
target: aarch64-apple-darwin
- os: macos-11
emacs-version: '28.1'
- os: macos-15
emacs-version: '29.4'
# Cross build
target: aarch64-apple-darwin
runs-on: ${{ matrix.os }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ 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
emacs-version: '27.2'
- os: macos-15
emacs-version: '28.2'
ext: dylib
host: x86_64-apple-darwin
- os: macos-11
emacs-version: '27.2'
- os: macos-15
emacs-version: '28.2'
ext: dylib
target: aarch64-apple-darwin
- os: ubuntu-20.04
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
2 changes: 1 addition & 1 deletion bin/setup.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cc12de3

Please sign in to comment.