Fix zstd setup --skip-build-php

Author: shivammathur

.github/workflows/ci.yml

@@ -119,7 +119,7 @@ jobs:
           done
   package:
     name: Update dist
-    if: "!contains(github.event.head_commit.message, 'skip-release')"
+    if: "always() && !contains(github.event.head_commit.message, 'skip-release')"
     needs: test
     runs-on: ubuntu-latest
     strategy:
@@ -129,9 +129,14 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Add ZSTD
+        env:
+          REPO: ${{ github.repository }}
+          TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          USER: ${{ github.repository_owner }}
+        run: bash scripts/install-zstd.sh
       - name: Package
         run: |
-          bash scripts/install-zstd.sh
           mkdir builds
           bash scripts/version-files.sh "$PHP_VERSION"
           bash scripts/stage.sh "$PHP_VERSION"
@@ -149,7 +154,7 @@ jobs:
           path: builds
   release:
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, 'skip-release')"
+    if: "always() && !contains(github.event.head_commit.message, 'skip-release')"
     needs: package
     steps:
       - uses: actions/checkout@v2

.github/workflows/zstd.yml

@@ -0,0 +1,31 @@
+name: Cache ZSTD
+on:
+  - workflow_dispatch
+jobs:
+  cache:
+    container: ubuntu:${{ matrix.container }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        container: [20.04, 18.04, 16.04]
+    if: "!contains(github.event.head_commit.message, 'skip-build')"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install requirements
+        run: apt-get update && apt-get install sudo curl make gcc jq unzip -y
+      - name: Get ZSTD_DIR
+        id: zstd
+        run: echo "::set-output name=ZSTD_DIR::$(curl -sL https://github.com/facebook/zstd/releases/latest | grep -Po "zstd-(\d+\.\d+\.\d+)" | head -n 1)"
+      - name: Add ZSTD
+        env:
+          REPO: ${{ github.repository }}
+          TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          USER: ${{ github.repository_owner }}
+        run: bash scripts/install-zstd.sh
+      - name: Upload zstd Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ steps.zstd.outputs.zstd_dir }}-ubuntu${{ matrix.container }}
+          path: /opt/zstd

scripts/install-zstd.sh

@@ -1,11 +1,21 @@
-if command -v brew >/dev/null; then
-  export PATH="$HOME/.linuxbrew/bin:$PATH"
-  echo "export PATH=$HOME/.linuxbrew/bin:\$PATH" >> "$GITHUB_ENV"
-  brew install zstd >/dev/null 2>&1
+sudo mkdir -p /opt/zstd
+. /etc/os-release
+zstd_dir=$(curl -sL https://github.com/facebook/zstd/releases/latest | grep -Po "zstd-(\d+\.\d+\.\d+)" | head -n 1)
+zstd_url=$(curl -sL https://api.github.com/repos/"$REPO"/actions/artifacts | jq -r --arg zstd_dir "$zstd_dir-ubuntu$VERSION_ID" '.artifacts[] | select(.name=="\($zstd_dir)").archive_download_url' 2>/dev/null | head -n 1)
+if [ "x$zstd_url" = "x" ]; then
+  sudo apt-get install zlib1g liblzma-dev liblz4-dev -y
+  curl -o /tmp/zstd.tar.gz -sL https://github.com/facebook/zstd/releases/latest/download/"$zstd_dir".tar.gz
+  tar -xzf /tmp/zstd.tar.gz -C /tmp
+  (
+    cd /tmp/"$zstd_dir" || exit 1
+    sudo make install -j"$(nproc)" PREFIX=/opt/zstd
+  )
 else
-  curl -sSLO http://archive.ubuntu.com/ubuntu/pool/main/g/gcc-10/gcc-10-base_10-20200411-0ubuntu1_amd64.deb
-  curl -sSLO http://archive.ubuntu.com/ubuntu/pool/main/g/gcc-10/libgcc-s1_10-20200411-0ubuntu1_amd64.deb
-  curl -sSLO http://archive.ubuntu.com/ubuntu/pool/universe/libz/libzstd/zstd_1.4.4+dfsg-3_amd64.deb
-  sudo DEBIAN_FRONTEND=noninteractive dpkg -i --force-conflicts ./*.deb && rm -rf ./*.deb
+  curl -u "$USER":"$TOKEN" -o /tmp/zstd.zip -sL "$zstd_url"
+  ls /tmp
+  sudo unzip /tmp/zstd.zip -d /opt/zstd
+  sudo chmod -R a+x /opt/zstd/bin
 fi
+sudo ln -sf /opt/zstd/bin/* /usr/local/bin
+rm -rf /tmp/zstd*
 zstd -V