From c2131130c86a7a1006bee4ac7c04516a68baef72 Mon Sep 17 00:00:00 2001 From: JenChieh Date: Thu, 12 Sep 2024 23:52:48 -0700 Subject: [PATCH 1/5] ci: Test with Eask --- .github/workflows/test.yml | 13 +++++++------ .gitignore | 2 ++ Cask | 13 ------------- Eask | 26 ++++++++++++++++++++++++++ justfile | 10 +++++----- 5 files changed, 40 insertions(+), 24 deletions(-) delete mode 100644 Cask create mode 100644 Eask diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fd25276..b495d5e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,24 +12,25 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] + os: [ubuntu-latest, macos-latest, windows-latest] emacs-version: - 27.2 - - 28.1 - - 29.3 + - 28.2 - 29.4 steps: - uses: actions/checkout@v4 + - uses: taiki-e/install-action@v2 with: tool: just@1.16.0 - - uses: purcell/setup-emacs@master + + - uses: jcs090218/setup-emacs@master with: version: ${{ matrix.emacs-version }} - - uses: cask/setup-cask@v1 + - uses: emacs-eask/setup-eask@master with: - version: 0.9.0 + version: 'snapshot' - name: Install requirements run: | diff --git a/.gitignore b/.gitignore index f062b08..8b51124 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ *.elc /.cask +/.eask +/dist /config.mk *autoloads.el test/test-project/target diff --git a/Cask b/Cask deleted file mode 100644 index cd3fe0f..0000000 --- a/Cask +++ /dev/null @@ -1,13 +0,0 @@ -(source gnu) -(source melpa) - -(package-file "rustic.el") - -(development - (depends-on "rust-mode" "1.0.2") - (depends-on "spinner") - (depends-on "ert-runner") - (depends-on "lsp-mode") - (depends-on "flycheck") - (depends-on "f") - (depends-on "project" "0.3.0")) diff --git a/Eask b/Eask new file mode 100644 index 0000000..29567c6 --- /dev/null +++ b/Eask @@ -0,0 +1,26 @@ +(package "rustic" + "3.5" + "Rust development environment") + +(package-file "rustic.el") + +(files "rustic-*.el") + +(source 'gnu) +(source 'melpa) + +(depends-on "rust-mode" "1.0.6") +(depends-on "dash") +(depends-on "f") +(depends-on "markdown-mode") +(depends-on "s") +(depends-on "spinner") +(depends-on "xterm-color") +(depends-on "flycheck") +(depends-on "project" "0.3.0") + +(development + (depends-on "ert-runner") + (depends-on "lsp-mode")) + +(setq network-security-level 'low) ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432 diff --git a/justfile b/justfile index 91d0271..fca8719 100644 --- a/justfile +++ b/justfile @@ -2,13 +2,13 @@ just: just --list --unsorted -# Install dependencies and build via cask +# Install dependencies and build via eask build: emacs --version - cask install - cask build + eask install-deps --dev + eask package # Test test: - cask emacs --batch -L . -L test -f batch-byte-compile $(cask files) - cask emacs --batch -L . -L test -l test/all-tests.el -f ert-run-tests-batch-and-exit + eask compile + eask emacs --batch -L . -L test -l test/all-tests.el -f ert-run-tests-batch-and-exit From b57cec42549763b101adeefbc7ca3245774d969d Mon Sep 17 00:00:00 2001 From: JenChieh Date: Thu, 12 Sep 2024 23:56:17 -0700 Subject: [PATCH 2/5] test: snapshot --- .github/workflows/test.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b495d5e..4e0ea22 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,6 +17,21 @@ jobs: - 27.2 - 28.2 - 29.4 + experimental: [false] + include: + - os: ubuntu-latest + emacs-version: snapshot + experimental: true + - os: macos-latest + emacs-version: snapshot + experimental: true + - os: windows-latest + emacs-version: snapshot + experimental: true + exclude: + - os: macos-latest + emacs-version: 27.2 + steps: - uses: actions/checkout@v4 From 12b63e3b838a1fecdfcc374d8bb692da528ae690 Mon Sep 17 00:00:00 2001 From: JenChieh Date: Thu, 12 Sep 2024 23:57:19 -0700 Subject: [PATCH 3/5] ci: Run only on the latest ref --- .github/workflows/test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4e0ea22..17ddcbe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,8 +6,12 @@ on: pull_request: workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: - unix-test: + test: runs-on: ${{ matrix.os }} strategy: fail-fast: false From fa9ba31e5e5387bcab96550bcf896d574ade21a2 Mon Sep 17 00:00:00 2001 From: JenChieh Date: Fri, 13 Sep 2024 00:08:01 -0700 Subject: [PATCH 4/5] ci: Remove macos and windows tests for now --- .github/workflows/test.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 17ddcbe..d05b6ad 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,11 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: + - ubuntu-latest + # TODO: Test other OSs! + #- macos-latest + #- windows-latest emacs-version: - 27.2 - 28.2 @@ -26,12 +30,12 @@ jobs: - os: ubuntu-latest emacs-version: snapshot experimental: true - - os: macos-latest - emacs-version: snapshot - experimental: true - - os: windows-latest - emacs-version: snapshot - experimental: true + #- os: macos-latest + # emacs-version: snapshot + # experimental: true + #- os: windows-latest + # emacs-version: snapshot + # experimental: true exclude: - os: macos-latest emacs-version: 27.2 From a81e6060cc805071a1492deda15b9f8571bc85bf Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Mon, 16 Sep 2024 21:44:28 -0700 Subject: [PATCH 5/5] ci: Remove unwanted test targets --- .github/workflows/test.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d05b6ad..8eeff6e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,20 +25,6 @@ jobs: - 27.2 - 28.2 - 29.4 - experimental: [false] - include: - - os: ubuntu-latest - emacs-version: snapshot - experimental: true - #- os: macos-latest - # emacs-version: snapshot - # experimental: true - #- os: windows-latest - # emacs-version: snapshot - # experimental: true - exclude: - - os: macos-latest - emacs-version: 27.2 steps: - uses: actions/checkout@v4