Skip to content

Commit fc26b25

Browse files
authored
Merge pull request #136 from Margen67/ci
Fix GitHub Actions
2 parents 0bb7b86 + 7baa729 commit fc26b25

File tree

1 file changed

+33
-39
lines changed

1 file changed

+33
-39
lines changed

.github/workflows/CI.yml

Lines changed: 33 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ jobs:
88
env:
99
POWERSHELL_TELEMETRY_OPTOUT: 1
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v4
1212
with:
1313
fetch-depth: 0
1414
- name: Build
1515
run: mingw32-make -j $env:NUMBER_OF_PROCESSORS -C bsnes
1616
- name: Prepare artifacts
1717
run: |
1818
cp -R pack bsnes\out\
19-
cp README.md bsnes\out\pack\readme.md
19+
cp README.md bsnes\out\pack
2020
cp bsnes\out\bsnes.exe bsnes\out\pack\bsnes_hd.exe
2121
- name: Upload artifacts
22-
uses: actions/upload-artifact@v2
22+
uses: actions/upload-artifact@v4
2323
with:
2424
name: bsnes_hd_beta_X_windows
2525
path: bsnes\out\pack
@@ -30,19 +30,18 @@ jobs:
3030
env:
3131
POWERSHELL_TELEMETRY_OPTOUT: 1
3232
steps:
33-
- uses: actions/checkout@v2
33+
- uses: actions/checkout@v4
3434
with:
3535
fetch-depth: 0
3636
- name: Build
3737
run: mingw32-make -j $env:NUMBER_OF_PROCESSORS -C bsnes target=libretro
3838
- name: Prepare artifacts
3939
run: |
40-
mkdir bsnes/out/pack
41-
cp README.md bsnes/out/pack
42-
cp LICENSE bsnes/out/pack
40+
mkdir -p bsnes/out/pack
41+
cp README.md LICENSE bsnes/out/pack
4342
cp -R bsnes/out/*bsnes* bsnes/out/pack
4443
- name: Upload artifacts
45-
uses: actions/upload-artifact@v2
44+
uses: actions/upload-artifact@v4
4645
with:
4746
name: bsnes_hd_beta_X_windows_libretro
4847
path: bsnes\out\pack
@@ -51,7 +50,7 @@ jobs:
5150
Linux:
5251
runs-on: ubuntu-latest
5352
steps:
54-
- uses: actions/checkout@v2
53+
- uses: actions/checkout@v4
5554
with:
5655
fetch-depth: 0
5756
- name: Setup
@@ -66,11 +65,11 @@ jobs:
6665
cp README.md bsnes/out/pack/readme.md
6766
cp bsnes/out/bsnes bsnes/out/pack/bsnes_hd
6867
chmod +x bsnes/out/pack/bsnes_hd
69-
mkdir bsnes/out/tar
68+
mkdir -p bsnes/out/tar
7069
cd bsnes/out/pack
7170
tar -jcvpf ../tar/bsnes_hd_beta_X_linux.tar.bz2 *
7271
- name: Upload artifacts
73-
uses: actions/upload-artifact@v2
72+
uses: actions/upload-artifact@v4
7473
with:
7574
name: UNPACK-LINUX
7675
path: bsnes/out/tar
@@ -79,7 +78,7 @@ jobs:
7978
Linux-libretro:
8079
runs-on: ubuntu-latest
8180
steps:
82-
- uses: actions/checkout@v2
81+
- uses: actions/checkout@v4
8382
with:
8483
fetch-depth: 0
8584
- name: Setup
@@ -90,12 +89,11 @@ jobs:
9089
run: make -j $(nproc) -C bsnes target=libretro
9190
- name: Prepare artifacts
9291
run: |
93-
mkdir bsnes/out/pack
94-
cp README.md bsnes/out/pack
95-
cp LICENSE bsnes/out/pack
92+
mkdir -p bsnes/out/pack
93+
cp README.md LICENSE bsnes/out/pack
9694
cp -R bsnes/out/*bsnes* bsnes/out/pack
9795
- name: Upload artifacts
98-
uses: actions/upload-artifact@v2
96+
uses: actions/upload-artifact@v4
9997
with:
10098
name: bsnes_hd_beta_X_linux_libretro
10199
path: bsnes/out/pack
@@ -104,7 +102,7 @@ jobs:
104102
Linux-ARM-libretro:
105103
runs-on: ubuntu-latest
106104
steps:
107-
- uses: actions/checkout@v2
105+
- uses: actions/checkout@v4
108106
with:
109107
fetch-depth: 0
110108
- name: add foreign arch
@@ -133,12 +131,11 @@ jobs:
133131
wget https://raw.githubusercontent.com/libretro/libretro-super/master/retrolink.sh && chmod +x retrolink.sh && ./retrolink.sh bsnes/out/bsnes_hd_beta_libretro.so
134132
- name: Prepare artifacts
135133
run: |
136-
mkdir bsnes/out/pack
137-
cp README.md bsnes/out/pack
138-
cp LICENSE bsnes/out/pack
134+
mkdir -p bsnes/out/pack
135+
cp README.md LICENSE bsnes/out/pack
139136
cp -R bsnes/out/*bsnes* bsnes/out/pack
140137
- name: Upload artifacts
141-
uses: actions/upload-artifact@v2
138+
uses: actions/upload-artifact@v4
142139
with:
143140
name: bsnes_hd_beta_X_linux_arm_libretro
144141
path: bsnes/out/pack
@@ -147,26 +144,25 @@ jobs:
147144
macOS:
148145
runs-on: macos-latest
149146
steps:
150-
- uses: actions/checkout@v2
147+
- uses: actions/checkout@v4
151148
with:
152149
fetch-depth: 0
153150
- name: Build
154151
run: |
155152
export MACOSX_DEPLOYMENT_TARGET=10.14
156-
make -j $(sysctl -n hw.ncpu) -C bsnes
153+
make -j $(getconf _NPROCESSORS_ONLN) -C bsnes
157154
- name: Prepare artifacts
158155
run: |
159-
mkdir bsnes/out/pack
160-
cp LICENSE bsnes/out/pack
161-
cp README.md bsnes/out/pack
156+
mkdir -p bsnes/out/pack
157+
cp LICENSE README.md bsnes/out/pack
162158
cp -R bsnes/out/*bsnes* bsnes/out/pack
163159
mv bsnes/out/pack/bsnes.app bsnes/out/pack/bsnes_hd.app
164160
chmod +x bsnes/out/pack/bsnes_hd.app/Contents/MacOS/bsnes
165-
mkdir bsnes/out/tar
161+
mkdir -p bsnes/out/tar
166162
cd bsnes/out/pack
167163
tar -jcvpf ../tar/bsnes_hd_beta_X_mac.tar.bz2 *
168164
- name: Upload artifacts
169-
uses: actions/upload-artifact@v2
165+
uses: actions/upload-artifact@v4
170166
with:
171167
name: UNPACK-MAC
172168
path: bsnes/out/tar
@@ -175,21 +171,20 @@ jobs:
175171
macOS-libretro:
176172
runs-on: macos-latest
177173
steps:
178-
- uses: actions/checkout@v2
174+
- uses: actions/checkout@v4
179175
with:
180176
fetch-depth: 0
181177
- name: Build
182178
run: |
183179
export MACOSX_DEPLOYMENT_TARGET=10.14
184-
make -j $(sysctl -n hw.ncpu) -C bsnes target=libretro
180+
make -j $(getconf _NPROCESSORS_ONLN) -C bsnes target=libretro
185181
- name: Prepare artifacts
186182
run: |
187-
mkdir bsnes/out/pack
188-
cp README.md bsnes/out/pack
189-
cp LICENSE bsnes/out/pack
183+
mkdir -p bsnes/out/pack
184+
cp README.md LICENSE bsnes/out/pack
190185
cp -R bsnes/out/*bsnes* bsnes/out/pack
191186
- name: Upload artifacts
192-
uses: actions/upload-artifact@v2
187+
uses: actions/upload-artifact@v4
193188
with:
194189
name: bsnes_hd_beta_X_mac_libretro
195190
path: bsnes/out/pack
@@ -198,7 +193,7 @@ jobs:
198193
Android-libretro:
199194
runs-on: ubuntu-latest
200195
steps:
201-
- uses: actions/checkout@v2
196+
- uses: actions/checkout@v4
202197
with:
203198
fetch-depth: 0
204199
- uses: nttld/setup-ndk@v1
@@ -208,11 +203,10 @@ jobs:
208203
run: |
209204
cd bsnes/target-libretro/jni
210205
ndk-build
211-
cd ../../..
212-
cp README.md bsnes/target-libretro/libs
213-
cp LICENSE bsnes/target-libretro/libs
206+
cd -
207+
cp README.md LICENSE bsnes/target-libretro/libs
214208
- name: Upload artifacts
215-
uses: actions/upload-artifact@v2
209+
uses: actions/upload-artifact@v4
216210
with:
217211
name: bsnes_hd_beta_X_android_libretro
218212
path: bsnes/target-libretro/libs

0 commit comments

Comments
 (0)