Skip to content

Commit 503d1fa

Browse files
committed
no json
1 parent 07e672e commit 503d1fa

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

.github/workflows/build.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,12 @@ jobs:
3939
strategy:
4040
matrix:
4141
source:
42-
- "{\"name\": \"29.1\", \"tarball\": \"https://ftp.gnu.org/gnu/emacs/emacs-29.1.tar.gz\", \"tarball_dir\": \"emacs-29.1\" }"
43-
- "{\"name\": \"29.1-native-json-rpc\", \"repo\": \"blahgeek/emacs\", \"commit\": \"b8e9c30dcae19eaa8deed9bd594e84d5cf6244cb\" }"
42+
- name: "29.1"
43+
tarball: "https://ftp.gnu.org/gnu/emacs/emacs-29.1.tar.gz"
44+
tarball_dir: "emacs-29.1"
45+
- name: "29.1-native-json-rpc"
46+
repo: "blahgeek/emacs"
47+
commit: "b8e9c30dcae19eaa8deed9bd594e84d5cf6244cb"
4448
build_with_x11: [ "yes", "no" ]
4549

4650
steps:
@@ -52,17 +56,17 @@ jobs:
5256

5357
- name: Download emacs source from tarball
5458
run: |
55-
curl -L ${{ fromJSON(matrix.source).tarball }} | tar xz
56-
mv ${{ fromJSON(matrix.source).tarball_dir }} emacs-src
57-
if: ${{ fromJSON(matrix.source).tarball }}
59+
curl -L ${{ matrix.source.tarball }} | tar xz
60+
mv ${{ matrix.source.tarball_dir }} emacs-src
61+
if: ${{ matrix.source.tarball }}
5862

5963
- name: Download emacs source from repo
6064
uses: actions/checkout@v4
6165
with:
62-
repository: ${{ fromJSON(matrix.source).repo }}
63-
ref: ${{ fromJSON(matrix.source).commit }}
66+
repository: ${{ matrix.source.repo }}
67+
ref: ${{ matrix.source.commit }}
6468
path: emacs-src
65-
if: ${{ fromJSON(matrix.source).repo }}
69+
if: ${{ matrix.source.repo }}
6670

6771
- name: Download artifact
6872
uses: actions/download-artifact@v2
@@ -76,5 +80,5 @@ jobs:
7680
docker image ls -a
7781
7882
- name: Run and package
79-
run: ./run-and-package.sh builder-image:latest ./emacs-src BUILD_WITH_X11=${{ matrix.build_with_x11 }} BUILD_RUN_AUTOGEN=${{ fromJSON(matrix.source).repo && 'yes' || 'no' }}
83+
run: ./run-and-package.sh builder-image:latest ./emacs-src BUILD_WITH_X11=${{ matrix.build_with_x11 }} BUILD_RUN_AUTOGEN=${{ matrix.source.repo && 'yes' || 'no' }}
8084

0 commit comments

Comments
 (0)