Skip to content

Commit e560312

Browse files
authored
Update package.yml
1 parent 5a27d76 commit e560312

File tree

1 file changed

+33
-9
lines changed

1 file changed

+33
-9
lines changed

.github/workflows/package.yml

+33-9
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Package
33
on: [push, pull_request]
44

55
jobs:
6-
build-freeimage-android:
6+
build-freeimage-android-unity-2021:
77
runs-on: ubuntu-latest
88
container:
99
image: unityci/editor:ubuntu-2021.3.14f1-android-1.0.1
@@ -21,11 +21,35 @@ jobs:
2121
shell: bash
2222
- uses: actions/upload-artifact@v3
2323
with:
24-
name: "arm64-v8a"
24+
name: "arm64-v8a-unity-2021"
2525
path: build-arm64-v8a/libFreeImage.so
2626
- uses: actions/upload-artifact@v3
2727
with:
28-
name: "armeabi-v7a"
28+
name: "armeabi-v7a-unity-2021"
29+
path: build-armeabi-v7a/libFreeImage.so
30+
build-freeimage-android-unity-2022:
31+
runs-on: ubuntu-latest
32+
container:
33+
image: unityci/editor:ubuntu-2022.2.0f1-base-1.0.1
34+
steps:
35+
- uses: actions/checkout@v1
36+
with:
37+
submodules: true
38+
- name: Build FreeImage
39+
run: |
40+
apt update -y
41+
apt install cmake -y
42+
apt install build-essential -y
43+
chmod a+x scripts/build-android.py
44+
python scripts/build-android.py /opt/unity/Editor
45+
shell: bash
46+
- uses: actions/upload-artifact@v3
47+
with:
48+
name: "arm64-v8a-unity-2022"
49+
path: build-arm64-v8a/libFreeImage.so
50+
- uses: actions/upload-artifact@v3
51+
with:
52+
name: "armeabi-v7a-unity-2022"
2953
path: build-armeabi-v7a/libFreeImage.so
3054
build-freeimage-ubuntu:
3155
runs-on: ubuntu-18.04
@@ -43,7 +67,7 @@ jobs:
4367
name: "ubuntu-16.04"
4468
path: build/libFreeImage.so
4569
package-unity-2021-3:
46-
needs: build-freeimage-android
70+
needs: build-freeimage-android-unity-2021
4771
runs-on: ubuntu-latest
4872
container:
4973
image: unityci/editor:ubuntu-2021.3.9f1-base-1.0.1
@@ -53,11 +77,11 @@ jobs:
5377
submodules: true
5478
- uses: actions/download-artifact@master
5579
with:
56-
name: arm64-v8a
80+
name: arm64-v8a-unity-2021
5781
path: binaries/arm64-v8a
5882
- uses: actions/download-artifact@master
5983
with:
60-
name: armeabi-v7a
84+
name: armeabi-v7a-unity-2021
6185
path: binaries/armeabi-v7a
6286
- uses: actions/download-artifact@master
6387
with:
@@ -77,7 +101,7 @@ jobs:
77101
name: UnityAsyncTextureImport-Unity-2021.unitypackage
78102
path: UnityAsyncTextureImport.unitypackage
79103
package-unity-2022-3:
80-
needs: build-freeimage-android
104+
needs: build-freeimage-android-unity-2022
81105
runs-on: ubuntu-latest
82106
container:
83107
image: unityci/editor:ubuntu-2022.2.0f1-base-1.0.1
@@ -87,11 +111,11 @@ jobs:
87111
submodules: true
88112
- uses: actions/download-artifact@master
89113
with:
90-
name: arm64-v8a
114+
name: arm64-v8a-unity-2022
91115
path: binaries/arm64-v8a
92116
- uses: actions/download-artifact@master
93117
with:
94-
name: armeabi-v7a
118+
name: armeabi-v7a-unity-2022
95119
path: binaries/armeabi-v7a
96120
- uses: actions/download-artifact@master
97121
with:

0 commit comments

Comments
 (0)