Skip to content

Commit 8fea41f

Browse files
jcs090218jcs090218
authored
Merge branch 'master' into dependabot/npm_and_yarn/yargs-18.0.0
2 parents 3b50856 + 6ac66d9 commit 8fea41f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+1806
-285
lines changed

‎.github/workflows/analyze.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ on:
55
branches:
66
- master
77
paths:
8-
- 'eask'
9-
- '**.yml'
108
- lisp/**
119
- cmds/**
1210
- src/**
1311
- test/**
12+
- '**.yml'
13+
- '**.json'
14+
- 'eask'
15+
# ignore
16+
- '!**/docs.yml'
1417
pull_request:
1518
branches:
1619
- master
@@ -36,7 +39,7 @@ jobs:
3639
- 27.2
3740
- 28.2
3841
- 29.4
39-
- 30.1
42+
- 30.2
4043
experimental: [false]
4144
include:
4245
- os: ubuntu-latest

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ on:
55
branches:
66
- master
77
paths:
8-
- 'eask'
9-
- '**.yml'
108
- lisp/**
119
- cmds/**
1210
- src/**
1311
- test/**
12+
- '**.yml'
1413
- '**.json'
14+
- 'eask'
15+
# ignore
16+
- '!**/docs.yml'
1517
pull_request:
1618
branches:
1719
- master
@@ -25,7 +27,7 @@ concurrency:
2527
cancel-in-progress: true
2628

2729
env:
28-
VERSION: 0.11.8
30+
VERSION: 0.11.9
2931
REPO_BIN: 'emacs-eask/binaries'
3032

3133
jobs:
@@ -108,7 +110,7 @@ jobs:
108110
#### Upload an artifact for testing purposes
109111

110112
- name: Upload for tests
111-
uses: actions/upload-artifact@v4
113+
uses: actions/upload-artifact@v5
112114
with:
113115
name: ${{ matrix.target }}
114116
path: dist

‎.github/workflows/compat.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ on:
55
branches:
66
- master
77
paths:
8-
- 'eask'
9-
- '**.yml'
108
- lisp/**
119
- cmds/**
1210
- src/**
1311
- test/**
12+
- '**.yml'
13+
- '**.json'
14+
- 'eask'
15+
# ignore
16+
- '!**/docs.yml'
1417
pull_request:
1518
branches:
1619
- master
@@ -36,7 +39,7 @@ jobs:
3639
- 27.2
3740
- 28.2
3841
- 29.4
39-
- 30.1
42+
- 30.2
4043
experimental: [false]
4144
include:
4245
- os: ubuntu-latest

‎.github/workflows/compile.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ on:
55
branches:
66
- master
77
paths:
8-
- 'eask'
9-
- '**.yml'
108
- lisp/**
119
- cmds/**
1210
- src/**
1311
- test/**
12+
- '**.yml'
13+
- '**.json'
14+
- 'eask'
15+
# ignore
16+
- '!**/docs.yml'
1417
pull_request:
1518
branches:
1619
- master
@@ -31,7 +34,7 @@ jobs:
3134
matrix:
3235
os: [ubuntu-latest]
3336
emacs-version:
34-
- 30.1
37+
- 30.2
3538

3639
steps:
3740
- uses: jcs090218/setup-emacs@master

‎.github/workflows/config.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ on:
55
branches:
66
- master
77
paths:
8-
- 'eask'
9-
- '**.yml'
108
- lisp/**
119
- cmds/**
1210
- src/**
1311
- test/**
12+
- '**.yml'
13+
- '**.json'
14+
- 'eask'
15+
# ignore
16+
- '!**/docs.yml'
1417
pull_request:
1518
branches:
1619
- master
@@ -36,7 +39,7 @@ jobs:
3639
- 27.2
3740
- 28.2
3841
- 29.4
39-
- 30.1
42+
- 30.2
4043
experimental: [false]
4144
include:
4245
- os: ubuntu-latest

‎.github/workflows/deprecated/color.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ on:
55
branches:
66
- master
77
paths:
8-
- 'eask'
9-
- '**.yml'
108
- lisp/**
119
- cmds/**
1210
- src/**
1311
- test/**
12+
- 'eask'
13+
- '**.yml'
14+
paths-ignore:
15+
- '**/docs.yml'
1416
pull_request:
1517
branches:
1618
- master
@@ -31,7 +33,7 @@ jobs:
3133
matrix:
3234
os: [ubuntu-latest, macos-latest, windows-latest]
3335
emacs-version:
34-
- 30.1
36+
- 30.2
3537

3638
steps:
3739
- uses: jcs090218/setup-emacs@master

‎.github/workflows/deprecated/error.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ on:
55
branches:
66
- master
77
paths:
8-
- 'eask'
9-
- '**.yml'
108
- lisp/**
119
- cmds/**
1210
- src/**
1311
- test/**
12+
- 'eask'
13+
- '**.yml'
14+
paths-ignore:
15+
- '**/docs.yml'
1416
pull_request:
1517
branches:
1618
- master
@@ -31,7 +33,7 @@ jobs:
3133
matrix:
3234
os: [ubuntu-latest, macos-latest, windows-latest]
3335
emacs-version:
34-
- 30.1
36+
- 30.2
3537

3638
steps:
3739
- uses: jcs090218/setup-emacs@master

‎.github/workflows/docker.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ on:
55
branches:
66
- master
77
paths:
8-
- 'eask'
9-
- '**.yml'
108
- lisp/**
119
- cmds/**
1210
- src/**
1311
- test/**
12+
- '**.yml'
13+
- '**.json'
14+
- 'eask'
15+
# ignore
16+
- '!**/docs.yml'
1417
pull_request:
1518
branches:
1619
- master

‎.github/workflows/docs.yml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ concurrency:
2020
group: ${{ github.workflow }}-${{ github.ref }}
2121
cancel-in-progress: true
2222

23+
env:
24+
PATH_DOC: ${{ github.workspace }}/emacs-eask.github.io
25+
2326
jobs:
2427
publish-doc:
2528
runs-on: ubuntu-latest
@@ -28,9 +31,9 @@ jobs:
2831
with:
2932
submodules: true
3033

31-
- uses: actions/setup-node@v4
34+
- uses: actions/setup-node@v6
3235
with:
33-
node-version: 20
36+
node-version: 22
3437

3538
- name: Setup Hugo
3639
uses: peaceiris/actions-hugo@v3
@@ -48,18 +51,24 @@ jobs:
4851
if: github.ref == 'refs/heads/master'
4952
with:
5053
repository: emacs-eask/emacs-eask.github.io
51-
path: emacs-eask.github.io
54+
path: ${{ env.PATH_DOC }}
5255
token: ${{ secrets.PAT }}
5356

57+
- name: Clean up before the build
58+
working-directory: ${{ env.PATH_DOC }}
59+
continue-on-error: true
60+
run: git rm -r '*'
61+
5462
- name: Build doc artifacts with Hugo
55-
run: |
56-
mkdir -p ../emacs-eask.github.io
57-
hugo --destination ../emacs-eask.github.io --minify
5863
working-directory: docs
64+
run: |
65+
mkdir -p ${{ env.PATH_DOC }}
66+
hugo --destination ${{ env.PATH_DOC }} --minify
5967
6068
# TODO: Generate better commit message
6169
- name: Publish doc artifacts
6270
if: github.ref == 'refs/heads/master'
71+
working-directory: ${{ env.PATH_DOC }}
6372
run: |
6473
git config user.name github-actions
6574
git config user.email [email protected]
@@ -70,4 +79,3 @@ jobs:
7079
SourceCommit: https://github.com/emacs-eask/cli/commit/${{ github.sha }}
7180
_UBLT_COMMIT_MSG_
7281
git push
73-
working-directory: emacs-eask.github.io

‎.github/workflows/emacs.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ on:
55
branches:
66
- master
77
paths:
8-
- 'eask'
9-
- '**.yml'
108
- lisp/**
119
- cmds/**
1210
- src/**
1311
- test/**
12+
- '**.yml'
13+
- '**.json'
14+
- 'eask'
15+
# ignore
16+
- '!**/docs.yml'
1417
pull_request:
1518
branches:
1619
- master
@@ -36,7 +39,7 @@ jobs:
3639
- 27.2
3740
- 28.2
3841
- 29.4
39-
- 30.1
42+
- 30.2
4043
experimental: [false]
4144
include:
4245
- os: ubuntu-latest

0 commit comments

Comments
 (0)