Skip to content

Commit d605629

Browse files
committed
post binaries to release rather than s3
1 parent 5f6ee5f commit d605629

File tree

5 files changed

+42
-25
lines changed

5 files changed

+42
-25
lines changed

.github/workflows/build.yml

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,14 @@ jobs:
5959
cd skia-canvas
6060
npm test && npm run package
6161
62-
- name: Upload to S3
62+
- name: Add to release
6363
env:
64-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
65-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
64+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6665
run: |
6766
cd skia-canvas
68-
npm run upload
67+
export RELEASE="v$(jq -r '.version' package.json)"
68+
export ASSET=$(npm run package 2>&1 | grep 'info package' | cut -d "\"" -f 2)
69+
gh release upload $RELEASE $ASSET
6970
7071
7172
linux-arm64:
@@ -132,13 +133,14 @@ jobs:
132133
cd skia-canvas
133134
npm test && npm run package
134135
135-
- name: Upload to S3
136+
- name: Add to release
136137
env:
137-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
138-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
138+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
139139
run: |
140140
cd skia-canvas
141-
npm run upload
141+
export RELEASE="v$(jq -r '.version' package.json)"
142+
export ASSET=$(npm run package 2>&1 | grep 'info package' | cut -d "\"" -f 2)
143+
gh release upload $RELEASE $ASSET
142144
143145
144146
linux-arm:
@@ -203,13 +205,14 @@ jobs:
203205
cd skia-canvas
204206
npm test && npm run package
205207
206-
- name: Upload to S3
208+
- name: Add to release
207209
env:
208-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
209-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
210+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
210211
run: |
211212
cd skia-canvas
212-
npm run upload
213+
export RELEASE="v$(jq -r '.version' package.json)"
214+
export ASSET=$(npm run package 2>&1 | grep 'info package' | cut -d "\"" -f 2)
215+
gh release upload $RELEASE $ASSET
213216
214217
215218
mac-x86:
@@ -240,12 +243,13 @@ jobs:
240243
run: |
241244
npm test && npm run package
242245
243-
- name: Upload to S3
246+
- name: Add to release
244247
env:
245-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
246-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
248+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
247249
run: |
248-
npm run upload
250+
export RELEASE="v$(jq -r '.version' package.json)"
251+
export ASSET=$(npm run package 2>&1 | grep 'info package' | cut -d "\"" -f 2)
252+
gh release upload $RELEASE $ASSET
249253
250254
251255
mac-arm64:
@@ -315,9 +319,10 @@ jobs:
315319
run: |
316320
npm test && npm run package
317321
318-
- name: Upload to S3
322+
- name: Add to release
319323
env:
320-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
321-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
324+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
322325
run: |
323-
npm run upload
326+
export RELEASE="v$(jq -r '.version' package.json)"
327+
export ASSET=$(npm run package 2>&1 | grep 'info package' | cut -d "\"" -f 2)
328+
gh release upload $RELEASE $ASSET

arch/arm/Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ RUN git clone https://gn.googlesource.com/gn && \
1313
cp out/gn /usr/local/bin/gn && \
1414
rm -rf /usr/local/src/gn
1515

16+
RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
17+
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null && \
18+
apt update && \
19+
apt install -y gh jq
20+
1621
ENV SKIA_GN_COMMAND="/usr/local/bin/gn"
1722
ENV SKIA_NINJA_COMMAND="/usr/bin/ninja"
1823

arch/glibc/Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@ RUN apt-get update && \
44
apt-get install -y -q \
55
python2 python3 perl git clang lldb lld \
66
build-essential software-properties-common \
7-
libssl-dev libfontconfig-dev \
8-
ninja-build
7+
libssl-dev libfontconfig-dev ninja-build
98

109
RUN add-apt-repository "deb http://deb.debian.org/debian buster-backports main" && \
1110
apt-get update && apt-get install -t buster-backports -y -q \
1211
curl
1312

14-
ENV SKIA_NINJA_COMMAND="/usr/bin/ninja"
13+
RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
14+
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null && \
15+
apt update && \
16+
apt install -y gh jq
17+
18+
ENV SKIA_NINJA_COMMAND="/usr/bin/ninja"

arch/musl/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@ ENV RUSTFLAGS="-C target-feature=-crt-static" \
88
SKIA_NINJA_COMMAND="/usr/bin/ninja"
99

1010
RUN apk update && apk add --update --no-cache \
11-
bash curl git python3 python2 perl clang llvm g++ build-base \
11+
bash curl jq git python3 python2 perl clang llvm g++ build-base \
1212
musl-dev openssl-dev fontconfig-dev fontconfig ttf-dejavu
1313

1414
RUN apk add --update --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
1515
gn ninja
1616

17+
RUN echo "@community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
18+
apk add github-cli@community
19+
1720
RUN export ASM="/usr/include/c++/10.3.1/aarch64-alpine-linux-musl/asm" && \
1821
mkdir -p ${ASM} && \
1922
touch ${ASM}/hwcap.h

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"module_path": "./lib/v{napi_build_version}",
5151
"remote_path": "./v{version}",
5252
"package_name": "{platform}-{arch}-{node_napi_label}-{libc}.tar.gz",
53-
"host": "https://skia-canvas.s3.us-east-1.amazonaws.com",
53+
"host": "https://github.com/samizdatco/skia-canvas/releases/download/",
5454
"napi_versions": [
5555
6
5656
]

0 commit comments

Comments
 (0)