From b319b1db7367ad24c2a401ea4d19612ab77ca50d Mon Sep 17 00:00:00 2001 From: petruki <31597636+petruki@users.noreply.github.com> Date: Fri, 22 Dec 2023 23:08:13 -0800 Subject: [PATCH] Bump CI actions --- .github/ISSUE_TEMPLATE/patch_report.md | 6 ++-- .github/workflows/master.yml | 44 ++++++++++++++------------ .github/workflows/release.yml | 20 ++++++------ package.json | 12 +++---- 4 files changed, 42 insertions(+), 40 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/patch_report.md b/.github/ISSUE_TEMPLATE/patch_report.md index a227bb2..2f09776 100644 --- a/.github/ISSUE_TEMPLATE/patch_report.md +++ b/.github/ISSUE_TEMPLATE/patch_report.md @@ -11,12 +11,10 @@ assignees: petruki A clear and concise description of why the patch is needed. **Current dependency** -- **Name**: -- **Version**: +- **name@version**: **Optional - Remediation** -- **Name**: -- **Version**: +- **name@version**: **Additional context** Links or documentation to the vulnerability or dependency update. diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 4ac89d4..c40b964 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -25,7 +25,7 @@ jobs: node-version: 20.x - name: Start MongoDB - uses: supercharge/mongodb-github-action@1.9.0 + uses: supercharge/mongodb-github-action@1.10.0 with: mongodb-version: 6.0 @@ -73,20 +73,20 @@ jobs: steps: - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push id: docker_build - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: push: true platforms: linux/amd64,linux/arm64 @@ -99,28 +99,30 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: 'master' - name: Checkout Kustomize - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: token: ${{ secrets.ARGOCD_PAT }} repository: switcherapi/switcher-deployment ref: master - - name: Set Image - uses: stefanprodan/kube-tools@v1 + - name: Set up arkade-get + uses: alexellis/arkade-get@master with: - kubectl: 1.24.0 - kustomize: 4.5.4 - command: | - cd switcher-api/base - echo RELEASE_TIME=`date` > environment-properties.env - kustomize edit set image trackerforce/switcher-api:latest=trackerforce/switcher-api@${{ needs.docker.outputs.digest }} - git config --global user.email "${{ github.actor }}@users.noreply.github.com" - git config --global user.name "${{ github.actor }}" - git add . - git commit -m "[argocd] switcher-api: ${{ needs.docker.outputs.digest }}" - git push \ No newline at end of file + kubectl: latest + kustomize: latest + + - name: Update GitOps repository + run: | + cd switcher-api/base + echo RELEASE_TIME=`date` > environment-properties.env + kustomize edit set image trackerforce/switcher-api:latest=trackerforce/switcher-api@${{ needs.docker.outputs.digest }} + git config --global user.email "${{ github.actor }}@users.noreply.github.com" + git config --global user.name "${{ github.actor }}" + git add . + git commit -m "[argocd] switcher-api: ${{ needs.docker.outputs.digest }}" + git push \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ce9a6b1..ead0437 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release CI on: release: - types: [ created ] + types: [ created, edited ] jobs: build-test: @@ -11,7 +11,9 @@ jobs: steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Use Node.js 20.x uses: actions/setup-node@v3 @@ -19,7 +21,7 @@ jobs: node-version: 20.x - name: Start MongoDB - uses: supercharge/mongodb-github-action@1.9.0 + uses: supercharge/mongodb-github-action@1.10.0 with: mongodb-version: 6.0 @@ -57,28 +59,28 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: trackerforce/switcher-api - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: . push: true diff --git a/package.json b/package.json index 7a1c928..f9b0e13 100644 --- a/package.json +++ b/package.json @@ -41,23 +41,23 @@ "jsonwebtoken": "^9.0.2", "moment": "^2.29.4", "mongodb": "^6.3.0", - "mongoose": "^8.0.2", - "pino": "^8.16.2", - "pino-pretty": "^10.2.3", + "mongoose": "^8.0.3", + "pino": "^8.17.1", + "pino-pretty": "^10.3.0", "swagger-ui-express": "^5.0.0", "switcher-client": "^3.2.0", "validator": "^13.11.0" }, "devDependencies": { "@babel/cli": "^7.23.4", - "@babel/core": "^7.23.5", + "@babel/core": "^7.23.6", "@babel/node": "^7.22.19", - "@babel/preset-env": "^7.23.5", + "@babel/preset-env": "^7.23.6", "@babel/register": "^7.22.15", "babel-jest": "^29.7.0", "babel-polyfill": "^6.26.0", "env-cmd": "^10.1.0", - "eslint": "^8.55.0", + "eslint": "^8.56.0", "jest": "^29.7.0", "jest-sonar-reporter": "^2.0.0", "node-notifier": "^10.0.1",