Skip to content

Commit c1c4317

Browse files
committed
fix: failing github ci
1 parent f46dacf commit c1c4317

File tree

4 files changed

+21
-16
lines changed

4 files changed

+21
-16
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ jobs:
3333
- name: Checkout
3434
uses: actions/[email protected]
3535

36+
- name: Generate dist files
37+
run: make generate
38+
3639
- name: Set Environment Variables
3740
env:
3841
IMAGE_NAMESPACE: wayofdev/node
@@ -75,6 +78,16 @@ jobs:
7578
with:
7679
install: true
7780

81+
- name: Set tag for Docker Release Image
82+
if: success() && startsWith(github.ref, 'refs/tags/')
83+
run: |
84+
echo "IMAGE_TAG=${{ env.IMAGE_NAMESPACE }}:${{ env.TEMPLATE }}-${{ env.VERSION }}" >> $GITHUB_ENV
85+
86+
- name: Set tag for Docker Master Image
87+
if: success() && ! startsWith(github.ref, 'refs/tags/')
88+
run: |
89+
echo "IMAGE_TAG=${{ env.IMAGE_NAMESPACE }}:${{ env.TEMPLATE }}-latest" >> $GITHUB_ENV
90+
7891
- name: Build and Export to Docker
7992
uses: docker/build-push-action@v4
8093
with:
@@ -85,17 +98,9 @@ jobs:
8598
cache-to: type=inline
8699
labels: ${{ steps.meta.outputs.labels }}
87100

88-
- name: Test Docker Release Image
89-
if: success() && startsWith(github.ref, 'refs/tags/')
101+
- name: Test Docker Image
90102
run: |
91-
echo "IMAGE_TAG=${{ env.IMAGE_NAMESPACE }}:${{ env.TEMPLATE }}-${{ env.VERSION }}" >> $GITHUB_ENV
92-
IMAGE_TAG=${{ env.IMAGE_TAG }} make test
93-
94-
- name: Test Docker Master Image
95-
if: success() && ! startsWith(github.ref, 'refs/tags/')
96-
run: |
97-
echo "IMAGE_TAG=${{ env.IMAGE_NAMESPACE }}:${{ env.TEMPLATE }}-latest" >> $GITHUB_ENV
98-
IMAGE_TAG=${{ env.IMAGE_TAG }} make test
103+
export IMAGE_TAG=${{ env.IMAGE_TAG }}; make test
99104
100105
- name: Push Docker Image
101106
uses: docker/build-push-action@v4

dist/18-alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN set -eux; \
2525
libc6-compat \
2626
&& ARCH=$(uname -m) && \
2727
if [ "$ARCH" = "x86_64" ]; then \
28-
curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.26.1/pnpm-linuxstatic-x64" -o /bin/pnpm; \
28+
curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.25.0/pnpm-linuxstatic-x64" -o /bin/pnpm; \
2929
elif [ "$ARCH" = "aarch64" ]; then \
30-
curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.26.1/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
30+
curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.25.0/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
3131
fi \
3232
&& chmod +x /bin/pnpm \
3333
&& yarn global add turbo

dist/19-alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN set -eux; \
2525
libc6-compat \
2626
&& ARCH=$(uname -m) && \
2727
if [ "$ARCH" = "x86_64" ]; then \
28-
curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.26.1/pnpm-linuxstatic-x64" -o /bin/pnpm; \
28+
curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.25.0/pnpm-linuxstatic-x64" -o /bin/pnpm; \
2929
elif [ "$ARCH" = "aarch64" ]; then \
30-
curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.26.1/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
30+
curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.25.0/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
3131
fi \
3232
&& chmod +x /bin/pnpm \
3333
&& yarn global add turbo

dist/lts-alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN set -eux; \
2525
libc6-compat \
2626
&& ARCH=$(uname -m) && \
2727
if [ "$ARCH" = "x86_64" ]; then \
28-
curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.26.1/pnpm-linuxstatic-x64" -o /bin/pnpm; \
28+
curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.25.0/pnpm-linuxstatic-x64" -o /bin/pnpm; \
2929
elif [ "$ARCH" = "aarch64" ]; then \
30-
curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.26.1/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
30+
curl -fsSL "https://github.com/pnpm/pnpm/releases/download/v7.25.0/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
3131
fi \
3232
&& chmod +x /bin/pnpm \
3333
&& yarn global add turbo

0 commit comments

Comments
 (0)