Skip to content

Commit ca46120

Browse files
authored
fix --branch
1 parent 45603d8 commit ca46120

File tree

1 file changed

+22
-13
lines changed

1 file changed

+22
-13
lines changed

.github/workflows/build.yml

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ jobs:
5858
- uses: actions/checkout@v2
5959
- uses: ncipollo/release-action@v1
6060
with:
61-
tag: ${{ needs.fetch-aseprite-info.outputs.release-tag }}
62-
body: Aseprite-${{ needs.fetch-aseprite-info.outputs.release-tag }}
61+
tag: ${{ needs.fetch-aseprite-info.outputs.release-tag }}
62+
body: Aseprite-${{ needs.fetch-aseprite-info.outputs.release-tag }}
6363
skipIfReleaseExists: true
64-
token: ${{ secrets.GITHUB_TOKEN }}
64+
token: ${{ secrets.GITHUB_TOKEN }}
6565

6666
build-aseprite:
6767
name: Build Aseprite
@@ -88,27 +88,29 @@ jobs:
8888
libx11-dev libxcursor-dev libxi-dev libgl1-mesa-dev libfontconfig1-dev
8989
9090
- name: Install Dependencies (macOS)
91-
if: runner.os == 'macOS-latest'
91+
if: runner.os == 'macOS'
9292
run: brew install ninja p7zip jpeg-turbo wget
9393

9494
- uses: actions/checkout@v4
9595

9696
- name: Install Aseprite
97+
shell: bash
9798
run: |
9899
git clone --recurse-submodules -j8 \
99100
https://github.com/aseprite/aseprite \
100-
--branch ${{ needs.create-release.outputs.release-tag }} aseprite
101+
--branch ${{ needs.fetch-aseprite-info.outputs.release-tag }} aseprite
101102
102103
- name: Install Skia
103104
working-directory: aseprite
105+
shell: bash
104106
run: |
105107
if [[ "${{ runner.os }}" == "Windows" ]]; then
106108
choco install wget -y --no-progress
107109
wget https://github.com/aseprite/skia/releases/download/m124-08a5439a6b/Skia-Windows-Release-x64.zip
108110
unzip Skia-Windows-Release-x64.zip -d skia
109111
elif [[ "${{ runner.os }}" == "macOS" ]]; then
110112
wget https://github.com/aseprite/skia/releases/download/m124-08a5439a6b/Skia-macOS-Release-arm64.zip
111-
unzip Skia-macOS-Release-arm64.zip -d skia
113+
unzip Skia-MacOS-Release-arm64.zip -d skia
112114
else
113115
wget https://github.com/aseprite/skia/releases/download/m124-08a5439a6b/Skia-Linux-Release-x64.zip
114116
unzip Skia-Linux-Release-x64.zip -d skia
@@ -151,20 +153,27 @@ jobs:
151153
- name: Clean Up Build folder
152154
shell: bash
153155
working-directory: aseprite/build/bin
154-
run: find . -mindepth 1 ! \( -name 'aseprite' -o -name 'aseprite.exe' -o -name 'data' -prune \) -exec rm -rf {} +
156+
run: |
157+
find . -mindepth 1 \
158+
! -name 'aseprite' \
159+
! -name 'aseprite.exe' \
160+
! -name 'data' -prune \
161+
-exec rm -rf {} +
155162
156163
- name: Make portable zip
157164
working-directory: aseprite/build/bin
158165
run: echo '# This file is here so Aseprite behaves as a portable program' > aseprite.ini
159166

160167
- name: Create release
161168
working-directory: aseprite/build/bin
162-
run: 7z -tzip a Aseprite-${{ needs.create-release.outputs.release-tag }}-${{ runner.os }}.zip *
169+
run: 7z -tzip a Aseprite-${{ needs.fetch-aseprite-info.outputs.release-tag }}-${{ matrix.os }}.zip *
163170

164171
- name: Upload release
165-
uses: svenstaro/upload-release-action@v2
172+
uses: svenstaro/upload-release-asset@v1
173+
env:
174+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
166175
with:
167-
repo_token: ${{ secrets.GITHUB_TOKEN }}
168-
file: aseprite/build/bin/Aseprite-${{ needs.create-release.outputs.release-tag }}-${{ runner.os }}.zip
169-
asset_name: Aseprite-${{ needs.create-release.outputs.release-tag }}-${{ runner.os }}.zip
170-
tag: ${{ needs.create-release.outputs.release-tag }}
176+
upload_url: ${{ needs.fetch-aseprite-info.outputs.upload-url }}
177+
asset_path: aseprite/build/bin/Aseprite-${{ needs.fetch-aseprite-info.outputs.release-tag }}-${{ matrix.os }}.zip
178+
asset_name: Aseprite-${{ needs.fetch-aseprite-info.outputs.release-tag }}-${{ matrix.os }}.zip
179+
asset_content_type: application/zip

0 commit comments

Comments
 (0)