fix: failing github ci

wayofdev · Feb 22, 2023 · c1c4317 · c1c4317
1 parent f46dacf
commit c1c4317
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,6 +33,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3.3.0
 
+      - name: Generate dist files
+        run: make generate
+
       - name: Set Environment Variables
         env:
           IMAGE_NAMESPACE: wayofdev/node
@@ -75,6 +78,16 @@ jobs:
         with:
           install: true
 
+      - name: Set tag for Docker Release Image
+        if: success() && startsWith(github.ref, 'refs/tags/')
+        run: |
+          echo "IMAGE_TAG=${{ env.IMAGE_NAMESPACE }}:${{ env.TEMPLATE }}-${{ env.VERSION }}" >> $GITHUB_ENV
+
+      - name: Set tag for Docker Master Image
+        if: success() && ! startsWith(github.ref, 'refs/tags/')
+        run: |
+          echo "IMAGE_TAG=${{ env.IMAGE_NAMESPACE }}:${{ env.TEMPLATE }}-latest" >> $GITHUB_ENV
+
       - name: Build and Export to Docker
         uses: docker/build-push-action@v4
         with:
@@ -85,17 +98,9 @@ jobs:
           cache-to: type=inline
           labels: ${{ steps.meta.outputs.labels }}
 
-      - name: Test Docker Release Image
-        if: success() && startsWith(github.ref, 'refs/tags/')
+      - name: Test Docker Image
         run: |
-          echo "IMAGE_TAG=${{ env.IMAGE_NAMESPACE }}:${{ env.TEMPLATE }}-${{ env.VERSION }}" >> $GITHUB_ENV
-          IMAGE_TAG=${{ env.IMAGE_TAG }} make test
-
-      - name: Test Docker Master Image
-        if: success() && ! startsWith(github.ref, 'refs/tags/')
-        run: |
-          echo "IMAGE_TAG=${{ env.IMAGE_NAMESPACE }}:${{ env.TEMPLATE }}-latest" >> $GITHUB_ENV
-          IMAGE_TAG=${{ env.IMAGE_TAG }} make test
+          export IMAGE_TAG=${{ env.IMAGE_TAG }}; make test
 
       - name: Push Docker Image
         uses: docker/build-push-action@v4

diff --git a/dist/18-alpine/Dockerfile b/dist/18-alpine/Dockerfile
@@ -25,9 +25,9 @@ RUN set -eux; \
     libc6-compat \
   && ARCH=$(uname -m) &&  \
     if [ "$ARCH" = "x86_64" ]; then \
-      curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.26.1/pnpm-linuxstatic-x64" -o /bin/pnpm; \
+      curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.25.0/pnpm-linuxstatic-x64" -o /bin/pnpm; \
     elif [ "$ARCH" = "aarch64" ]; then \
-      curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.26.1/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
+      curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.25.0/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
     fi \
   && chmod +x /bin/pnpm \
   && yarn global add turbo
diff --git a/dist/19-alpine/Dockerfile b/dist/19-alpine/Dockerfile
@@ -25,9 +25,9 @@ RUN set -eux; \
     libc6-compat \
   && ARCH=$(uname -m) &&  \
     if [ "$ARCH" = "x86_64" ]; then \
-      curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.26.1/pnpm-linuxstatic-x64" -o /bin/pnpm; \
+      curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.25.0/pnpm-linuxstatic-x64" -o /bin/pnpm; \
     elif [ "$ARCH" = "aarch64" ]; then \
-      curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.26.1/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
+      curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.25.0/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
     fi \
   && chmod +x /bin/pnpm \
   && yarn global add turbo
diff --git a/dist/lts-alpine/Dockerfile b/dist/lts-alpine/Dockerfile
@@ -25,9 +25,9 @@ RUN set -eux; \
     libc6-compat \
   && ARCH=$(uname -m) &&  \
     if [ "$ARCH" = "x86_64" ]; then \
-      curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.26.1/pnpm-linuxstatic-x64" -o /bin/pnpm; \
+      curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.25.0/pnpm-linuxstatic-x64" -o /bin/pnpm; \
     elif [ "$ARCH" = "aarch64" ]; then \
-      curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.26.1/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
+      curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.25.0/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
     fi \
   && chmod +x /bin/pnpm \
   && yarn global add turbo