Reverting to S3

Author: samizdatco

.github/workflows/build.yml

@@ -59,14 +59,13 @@ jobs:
         cd skia-canvas
         npm test && npm run package
 
-    - name: Add to release
+    - name: Upload to S3
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       run: |
         cd skia-canvas
-        export RELEASE="v$(jq -r '.version' package.json)"
-        export ASSET=$(npm run package 2>&1 | grep 'info package' | cut -d "\"" -f 2)
-        gh release upload $RELEASE $ASSET
+        npm run upload
 
 
   linux-arm64:
@@ -133,14 +132,13 @@ jobs:
         cd skia-canvas
         npm test && npm run package
 
-    - name: Add to release
+    - name: Upload to S3
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       run: |
         cd skia-canvas
-        export RELEASE="v$(jq -r '.version' package.json)"
-        export ASSET=$(npm run package 2>&1 | grep 'info package' | cut -d "\"" -f 2)
-        gh release upload $RELEASE $ASSET
+        npm run upload
 
 
   linux-arm:
@@ -205,14 +203,13 @@ jobs:
         cd skia-canvas
         npm test && npm run package
 
-    - name: Add to release
+    - name: Upload to S3
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       run: |
         cd skia-canvas
-        export RELEASE="v$(jq -r '.version' package.json)"
-        export ASSET=$(npm run package 2>&1 | grep 'info package' | cut -d "\"" -f 2)
-        gh release upload $RELEASE $ASSET
+        npm run upload
 
 
   mac-x86:
@@ -243,13 +240,12 @@ jobs:
       run: |
         npm test && npm run package
 
-    - name: Add to release
+    - name: Upload to S3
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       run: |
-        export RELEASE="v$(jq -r '.version' package.json)"
-        export ASSET=$(npm run package 2>&1 | grep 'info package' | cut -d "\"" -f 2)
-        gh release upload $RELEASE $ASSET
+        npm run upload
 
 
   mac-arm64:
@@ -285,13 +281,12 @@ jobs:
         sed -i.bak 's/"package_name":.*/"package_name": "{platform}-arm64-{node_napi_label}-{libc}.tar.gz",/' package.json
         npm run package
 
-    - name: Add to release
+    - name: Upload to S3
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       run: |
-        export RELEASE="v$(jq -r '.version' package.json)"
-        export ASSET=$(npm run package 2>&1 | grep 'info package' | cut -d "\"" -f 2)
-        gh release upload $RELEASE $ASSET
+        npm run upload
 
 
   windows-x86:
@@ -320,10 +315,9 @@ jobs:
       run: |
         npm test && npm run package
 
-    - name: Add to release
+    - name: Upload to S3
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       run: |
-        export RELEASE="v$(jq -r '.version' package.json)"
-        export ASSET=$(npm run package 2>&1 | grep 'info package' | cut -d "\"" -f 2)
-        gh release upload $RELEASE $ASSET
+        npm run upload

arch/arm/Dockerfile

@@ -13,11 +13,6 @@ RUN git clone https://gn.googlesource.com/gn && \
     cp out/gn /usr/local/bin/gn && \
     rm -rf /usr/local/src/gn
 
-RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
-    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 && \
-    apt update && \
-    apt install -y gh jq
-
 ENV SKIA_GN_COMMAND="/usr/local/bin/gn"
 ENV SKIA_NINJA_COMMAND="/usr/bin/ninja"
 

arch/glibc/Dockerfile

@@ -4,15 +4,11 @@ RUN apt-get update && \
     apt-get install -y -q \
     python2 python3 perl git clang lldb lld \
     build-essential software-properties-common \
-    libssl-dev libfontconfig-dev ninja-build
+    libssl-dev libfontconfig-dev \
+    ninja-build
 
 RUN add-apt-repository "deb http://deb.debian.org/debian buster-backports main" && \
     apt-get update && apt-get install -t buster-backports -y -q \
     curl
 
-RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
-    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 && \
-    apt update && \
-    apt install -y gh jq
-
-ENV SKIA_NINJA_COMMAND="/usr/bin/ninja"
+ENV SKIA_NINJA_COMMAND="/usr/bin/ninja"

arch/musl/Dockerfile

@@ -8,15 +8,12 @@ ENV RUSTFLAGS="-C target-feature=-crt-static" \
     SKIA_NINJA_COMMAND="/usr/bin/ninja"
 
 RUN apk update && apk add --update --no-cache \
-    bash curl jq git python3 python2 perl clang llvm g++ build-base \
+    bash curl git python3 python2 perl clang llvm g++ build-base \
     musl-dev openssl-dev fontconfig-dev fontconfig ttf-dejavu
 
 RUN apk add --update --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
     gn ninja
 
-RUN echo "@community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
-    apk add github-cli@community
-
 RUN export ASM="/usr/include/c++/10.3.1/aarch64-alpine-linux-musl/asm" && \
     mkdir -p ${ASM} && \
     touch ${ASM}/hwcap.h

package.json

@@ -50,7 +50,7 @@
     "module_path": "./lib/v{napi_build_version}",
     "remote_path": "./v{version}",
     "package_name": "{platform}-{arch}-{node_napi_label}-{libc}.tar.gz",
-    "host": "https://github.com/samizdatco/skia-canvas/releases/download/",
+    "host": "https://skia-canvas.s3.us-east-1.amazonaws.com",
     "napi_versions": [
       6
     ]