Skip to content

Commit

Permalink
Merge branch 'ci'
Browse files Browse the repository at this point in the history
  • Loading branch information
ubolonton committed Sep 19, 2024
2 parents 4054a4c + d053919 commit 126241a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
9 changes: 1 addition & 8 deletions .azure-pipelines/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,6 @@ strategy:
# - https://knight.sc/reverse%20engineering/2019/02/20/syspolicyd-internals.html
# - https://www.naut.ca/blog/2020/11/13/forbidden-commands-to-liberate-macos/

macOS-11-emacs-27.2:
IMAGE_NAME: 'macOS-11'
EVM_EMACS: emacs-27.2
macOS-11-emacs-28.1:
IMAGE_NAME: 'macOS-11'
EVM_EMACS: emacs-28.1

macOS-12-emacs-27.2:
IMAGE_NAME: 'macOS-12'
EVM_EMACS: emacs-27.2
Expand Down Expand Up @@ -111,7 +104,7 @@ pool:
steps:
- template: steps/setup-rust.yml
parameters:
version: '1.56.0'
version: '1.63.0'
- template: steps/-build.yml
- template: steps/setup-emacs.yml
- template: steps/-test.yml
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
fail-fast: false
matrix:
os:
- macos-11
- macos-12
- macos-13
- ubuntu-20.04
- ubuntu-22.04
- windows-2019
Expand All @@ -31,7 +31,7 @@ jobs:
- '28.2'
- '29.2'
include:
- os: macos-11
- os: macos-12
emacs-version: '26.3'
- os: ubuntu-20.04
emacs-version: '26.3'
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
- run: ./bin/test

ci-aarch64:
runs-on: macos-11
runs-on: macos-12
steps:
- name: Set up Rust
run: |
Expand Down

0 comments on commit 126241a

Please sign in to comment.