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..5b185eab 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b95f11eb..8c751194 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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' 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