Skip to content

Commit cc12de3

Browse files
authored
fix: macos-12 deprecation (#289)
* fix: macos-12 deprecation * fix: Emacs 27.x is no longer provides proper binaries * fix: eask link command
1 parent 02fe7b8 commit cc12de3

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

.github/workflows/integ.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
os:
20-
- macos-12
20+
- macos-15
2121
- ubuntu-18.04
2222
- windows-2019
2323
emacs-version:

.github/workflows/main.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@ jobs:
2727
fail-fast: false
2828
matrix:
2929
os:
30-
- macos-12
30+
- macos-15
3131
- ubuntu-20.04
3232
- windows-2019
3333
emacs-version:
34-
- '27.2'
35-
- '28.1'
34+
- '28.2'
35+
- '29.4'
3636
include:
3737
# XXX: The (os, emacs-version) combination must be different from those from those above,
3838
# otherwise GitHub Actions modifies the existing combinations, instead of adding new.
39-
- os: macos-11
40-
emacs-version: '27.2'
39+
- os: macos-15
40+
emacs-version: '28.2'
4141
# Cross build
4242
target: aarch64-apple-darwin
43-
- os: macos-11
44-
emacs-version: '28.1'
43+
- os: macos-15
44+
emacs-version: '29.4'
4545
# Cross build
4646
target: aarch64-apple-darwin
4747
runs-on: ${{ matrix.os }}

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919
# The `os` versions below should be as low as possible, for better compatibility.
2020
include:
2121
# TODO: Get host platform from rustc instead of specifying it explicitly.
22-
- os: macos-11
23-
emacs-version: '27.2'
22+
- os: macos-15
23+
emacs-version: '28.2'
2424
ext: dylib
2525
host: x86_64-apple-darwin
26-
- os: macos-11
27-
emacs-version: '27.2'
26+
- os: macos-15
27+
emacs-version: '28.2'
2828
ext: dylib
2929
target: aarch64-apple-darwin
3030
- os: ubuntu-20.04
@@ -126,7 +126,7 @@ jobs:
126126
fail-fast: false
127127
matrix:
128128
include:
129-
- os: macos-12
129+
- os: macos-15
130130
emacs-version: '27.2'
131131
- os: ubuntu-20.04
132132
emacs-version: '27.2'

bin/setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ source "$here/env.bash"
99
cd "$PROJECT_ROOT"
1010
# XXX: Create the directory because `eask link` doesn't.
1111
#mkdir -p "$(eask package-directory)"
12-
eask link tsc core
12+
eask link add tsc core
1313
eask install
1414
)

bin/setup.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ try {
66
# XXX: Create the directory because `eask link` doesn't.
77
#$eask_package_dir = ((eask package-directory) | Out-String).Trim()
88
#New-Item -ItemType Directory -Force -Path "$eask_package_dir"
9-
eask link tsc core
9+
eask link add tsc core
1010
eask install
1111
} finally {
1212
Pop-Location

0 commit comments

Comments
 (0)