From 180aa28d166833a33e03122dab0ff42360d801d8 Mon Sep 17 00:00:00 2001 From: DanielWTE Date: Sun, 4 Aug 2024 20:21:13 +0200 Subject: [PATCH 1/6] Added isNaN checks at analytics page --- packages/dashboard/src/pages/analytics/index.tsx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/dashboard/src/pages/analytics/index.tsx b/packages/dashboard/src/pages/analytics/index.tsx index ee6918d..1d39cd3 100644 --- a/packages/dashboard/src/pages/analytics/index.tsx +++ b/packages/dashboard/src/pages/analytics/index.tsx @@ -65,7 +65,12 @@ export default function Index() {

Bounce Rate

- <>{((analytics.emails.bounced / analytics.emails.total) * 100).toFixed(2)}% + <> + {Number.isNaN((analytics.emails.bounced / analytics.emails.total) * 100) + ? 0 + : ((analytics.emails.bounced / analytics.emails.total) * 100).toFixed(2)} + % +

@@ -123,7 +128,12 @@ export default function Index() {

Spam Rate

- <>{((analytics.emails.complaint / analytics.emails.total) * 100).toFixed(2)}% + <> + {Number.isNaN((analytics.emails.complaint / analytics.emails.total) * 100) + ? 0 + : ((analytics.emails.complaint / analytics.emails.total) * 100).toFixed(2)} + % +

From 64a6698cea4281690092d072adbc1d32593b9069 Mon Sep 17 00:00:00 2001 From: Dries Augustyns Date: Mon, 5 Aug 2024 08:20:32 +0200 Subject: [PATCH 2/6] Migrate to Yarn --- .github/workflows/docker-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 7ef9b55..7a70033 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -19,12 +19,12 @@ jobs: node-version: "16" - name: Install dependencies - run: npm install + run: yarn install - name: Increment version id: version run: | - npm run release + yarn release VERSION=$(node -p "require('./package.json').version") echo "VERSION=$VERSION" >> $GITHUB_ENV @@ -61,7 +61,7 @@ jobs: node-version: "16" - name: Install dependencies - run: npm install + run: yarn install - name: Get package version id: version From 506576103c6001c25ae22743e55910e7c3d2eb19 Mon Sep 17 00:00:00 2001 From: Dries Augustyns Date: Mon, 5 Aug 2024 08:21:57 +0200 Subject: [PATCH 3/6] Bump node version --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 7a70033..ee0d8cb 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -58,7 +58,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: "16" + node-version: "18" - name: Install dependencies run: yarn install From 090f6c50c1a1b8254b6d2b24b8cefe3008968510 Mon Sep 17 00:00:00 2001 From: Dries Augustyns Date: Mon, 5 Aug 2024 08:22:53 +0200 Subject: [PATCH 4/6] Bump node version --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index ee0d8cb..752d5ae 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: "16" + node-version: "18" - name: Install dependencies run: yarn install From eead7bf9055b87bf076439402bd1d440497b8b4b Mon Sep 17 00:00:00 2001 From: Dries Augustyns Date: Mon, 5 Aug 2024 08:26:34 +0200 Subject: [PATCH 5/6] Remove yarn release command --- .github/workflows/docker-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 752d5ae..3dddfd8 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -24,7 +24,6 @@ jobs: - name: Increment version id: version run: | - yarn release VERSION=$(node -p "require('./package.json').version") echo "VERSION=$VERSION" >> $GITHUB_ENV From cc3f91e1794237343c6bc71c88331917b4fe33ed Mon Sep 17 00:00:00 2001 From: Dries Augustyns Date: Mon, 5 Aug 2024 08:36:25 +0200 Subject: [PATCH 6/6] Revert back to old workflow --- .github/workflows/docker-build.yml | 83 ++++-------------------------- 1 file changed, 11 insertions(+), 72 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 3dddfd8..cbd78ee 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -1,4 +1,4 @@ -name: Version Increment and Build Docker Image +name: Build and Push Docker image on: push: @@ -6,71 +6,17 @@ on: - main jobs: - increment_version: + docker: runs-on: ubuntu-latest - if: github.event_name == 'push' steps: - - name: Check out the repository - uses: actions/checkout@v3 - - - name: Set up Node.js - uses: actions/setup-node@v4 - with: - node-version: "18" - - - name: Install dependencies - run: yarn install - - - name: Increment version - id: version - run: | - VERSION=$(node -p "require('./package.json').version") - echo "VERSION=$VERSION" >> $GITHUB_ENV - - - name: Commit version changes - run: | - git config --global user.name "github-actions[bot]" - git config --global user.email "github-actions[bot]@users.noreply.github.com" - git checkout -b version-bump - git add package.json yarn.lock - git commit -m "chore: bump version to ${{ env.VERSION }}" - git push origin version-bump - - - name: Create Pull Request - uses: peter-evans/create-pull-request@v5 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: "chore: bump version to ${{ env.VERSION }}" - branch: version-bump - title: "chore: bump version to ${{ env.VERSION }}" - body: "Automatically incremented version based on changes in main." - base: main - - build_and_push: - runs-on: ubuntu-latest - if: github.event.pull_request.merged == true - needs: increment_version - steps: - - name: Check out the repository - uses: actions/checkout@v3 - - - name: Set up Node.js - uses: actions/setup-node@v4 - with: - node-version: "18" - - - name: Install dependencies - run: yarn install - - - name: Get package version - id: version - run: echo "VERSION=$(node -p \"require('./package.json').version\")" >> $GITHUB_ENV + - name: Check out the repo + uses: actions/checkout@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v1 - name: Cache Docker layers - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ github.sha }} @@ -78,32 +24,25 @@ jobs: ${{ runner.os }}-buildx- - name: Log in to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v1 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@v4 - with: - images: driaug/plunk - tags: | - type=raw,value=${{ env.VERSION }} - type=raw,value=latest - - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v2 with: context: . file: ./Dockerfile push: true - tags: ${{ steps.meta.outputs.tags }} + tags: driaug/plunk:latest platforms: linux/amd64,linux/arm64 cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max # Temp fix + # https://github.com/docker/build-push-action/issues/252 + # https://github.com/moby/buildkit/issues/1896 - name: Move cache run: | rm -rf /tmp/.buildx-cache