Skip to content

Commit 954bd47

Browse files
[ci] disable zstd
1 parent f6380e3 commit 954bd47

File tree

1 file changed

+18
-23
lines changed

1 file changed

+18
-23
lines changed

.github/workflows/make.yml

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -58,35 +58,37 @@ jobs:
5858
if: runner.os == 'Linux'
5959
shell: bash
6060
run: |
61-
./configure --target=z80-none-elf --disable-gdb --disable-sim --disable-readline --disable-nls --prefix="$GITHUB_WORKSPACE/binutils-install"
61+
./configure --target=z80-none-elf --with-zstd=no --disable-gdb --disable-sim --disable-readline --disable-nls --prefix="${{ runner.temp }}/binutils"
6262
make -j4 && make install-strip -j4
6363
6464
- name: "[macOS] Build binutils"
6565
if: runner.os == 'macOS'
6666
shell: bash
6767
run: |
68-
./configure --target=z80-none-elf --disable-gdb --disable-sim --disable-readline --disable-nls --with-system-zlib --prefix="$GITHUB_WORKSPACE/binutils-install"
68+
./configure --target=z80-none-elf --with-zstd=no --disable-gdb --disable-sim --disable-readline --disable-nls --with-system-zlib --prefix="${{ runner.temp }}/binutils"
6969
make -j4 && make install-strip -j4
7070
7171
- name: "[Windows] Build binutils"
7272
if: runner.os == 'Windows'
7373
shell: msys2 {0}
7474
run: |
75-
PREFIX=$(cygpath -m "$GITHUB_WORKSPACE/binutils-install")
76-
./configure --target=z80-none-elf --disable-gdb --disable-sim --disable-readline --disable-nls --disable-shared --enable-static --prefix="$PREFIX"
75+
PREFIX=$(cygpath -m "${{ runner.temp }}/binutils")
76+
./configure --target=z80-none-elf --with-zstd=no --disable-gdb --disable-sim --disable-readline --disable-nls --disable-shared --enable-static --prefix="$PREFIX"
7777
make configure-host && make -j4 LDFLAGS="-all-static" MAKEINFO=true && make install-strip -j4 MAKEINFO=true
7878
7979
- name: "[Unix] Tar install"
8080
if: runner.os != 'Windows'
8181
shell: bash
8282
run: |
83-
tar -czvf binutils-${{ runner.os }}.${{ matrix.install-output-ext }} binutils-install
83+
cd ${{ runner.temp }} && tar -czvf binutils-${{ runner.os }}.${{ matrix.install-output-ext }} binutils
84+
mv ${{ runner.temp }}/binutils-${{ runner.os }}.${{ matrix.install-output-ext }} ${{github.workspace}}
8485
8586
- name: "[Windows] Tar install"
8687
if: runner.os == 'Windows'
8788
shell: msys2 {0}
8889
run: |
89-
tar -czvf binutils-${{ runner.os }}.${{ matrix.install-output-ext }} binutils-install
90+
cd ${{ runner.temp }} && tar -czvf binutils-${{ runner.os }}.${{ matrix.install-output-ext }} binutils
91+
mv ${{ runner.temp }}/binutils-${{ runner.os }}.${{ matrix.install-output-ext }} ${{github.workspace}}
9092
9193
- name: Upload binutils
9294
uses: actions/upload-artifact@v4
@@ -125,32 +127,25 @@ jobs:
125127
name: binutils-Windows
126128
path: ${{github.workspace}}/windows
127129

128-
- name: Extract and Zip Ubuntu Artifacts
130+
- name: Create Ubunutu Nightly
129131
run: |
130132
cd ubuntu
131-
tar -xzvf binutils-Linux.tar.gz
132-
mv binutils-install binutils
133-
zip -r9 ../binutils_ubuntu_nightly.zip binutils
133+
mv binutils-Linux.tar.gz ../binutils_ubuntu_nightly.tar.gz
134134
135-
- name: Extract and Zip macOS Intel Artifacts
135+
- name: Create macOS Intel Nightly
136136
run: |
137137
cd macos-intel
138-
tar -xzvf binutils-macOS.tar.gz
139-
mv binutils-install binutils
140-
zip -r9 ../binutils_macos_intel_nightly.zip binutils
138+
mv binutils-macOS.tar.gz ../binutils_macos_intel_nightly.tar.gz
141139
142-
- name: Extract and Zip macOS ARM Artifacts
140+
- name: Create macOS ARM Nightly
143141
run: |
144142
cd macos-arm
145-
tar -xzvf binutils-macOS.tar.gz
146-
mv binutils-install binutils
147-
zip -r9 ../binutils_macos_arm_nightly.zip binutils
143+
mv binutils-macOS.tar.gz ../binutils_macos_arm_nightly.tar.gz
148144
149-
- name: Extract and Zip Windows Artifacts
145+
- name: Create Windows Nightly
150146
run: |
151147
cd windows
152148
tar -xzvf binutils-Windows.tar.gz
153-
mv binutils-install binutils
154149
zip -r9 ../binutils_windows_nightly.zip binutils
155150
156151
- name: Create Nightly Release
@@ -160,7 +155,7 @@ jobs:
160155
name: Nightly Build
161156
prerelease: true
162157
files: |
163-
binutils_ubuntu_nightly.zip
164-
binutils_macos_intel_nightly.zip
165-
binutils_macos_arm_nightly.zip
158+
binutils_ubuntu_nightly.tar.gz
159+
binutils_macos_intel_nightly.tar.gz
160+
binutils_macos_arm_nightly.tar.gz
166161
binutils_windows_nightly.zip

0 commit comments

Comments
 (0)