From 886df60e7fd10e2d7702f6addfc64baab4ff2e5a Mon Sep 17 00:00:00 2001 From: 030 Date: Sat, 9 Dec 2023 19:34:58 +0100 Subject: [PATCH] build(deps): [#399] Use semantic versioning for plugins in github actions. --- .github/workflows/dip.yml | 8 ++++---- .github/workflows/dive.yml | 2 +- .github/workflows/docker.yml | 8 ++++---- .github/workflows/dockle.yml | 6 ++++-- .github/workflows/go.yml | 6 +++--- .github/workflows/gosec.yml | 4 ++-- .github/workflows/hadolint.yml | 2 +- .github/workflows/integration.yml | 4 ++-- .github/workflows/release.yml | 8 ++++---- .github/workflows/snapcraft.yml | 6 +++--- .github/workflows/trivy.yml | 2 +- .github/workflows/yamllint.yml | 2 +- build/package/snap/snapcraft.yaml | 2 +- docs/CHANGELOG.md | 8 ++++++-- docs/quickstarts/snippets/n3dr/DOWNLOAD.md | 6 +++--- 15 files changed, 40 insertions(+), 34 deletions(-) diff --git a/.github/workflows/dip.yml b/.github/workflows/dip.yml index 2b75f18a..aeda1e42 100644 --- a/.github/workflows/dip.yml +++ b/.github/workflows/dip.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest name: Check whether images are up-to-date steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 with: fetch-depth: 0 token: ${{ secrets.WORKFLOW_TOKEN }} @@ -21,7 +21,7 @@ jobs: - name: Check Alpine run: ./dip image --name=alpine --regex=^3\.[0-9]+\.[0-9]+$ --updateDockerfile - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5.0.0 with: go-version: 1.19.0 - name: Check Golang @@ -66,7 +66,7 @@ jobs: sed -i "s|\(releases\/download\/\)\([0-9]\+\.\)\{2\}[0-9]\+|\1${{ env.NEW_TAG }}|g" README.md sed -i "s|\(n3dr\/releases\/tag\/\)\([0-9]\+\.\)\{2\}[0-9]\+|\1${{ env.NEW_TAG }}|g" ./docs/quickstarts/snippets/n3dr/DOWNLOAD.md sed -i "s|\(releases\/download\/\)\([0-9]\+\.\)\{2\}[0-9]\+|\1${{ env.NEW_TAG }}|g" ./docs/quickstarts/snippets/n3dr/DOWNLOAD.md - - uses: EndBug/add-and-commit@v9 + - uses: EndBug/add-and-commit@v9.1.3 with: author_name: github-actions[bot] author_email: 41898282+github-actions[bot]@users.noreply.github.com @@ -80,7 +80,7 @@ jobs: tar -xvf /tmp/git-chglog_0.15.1_linux_amd64.tar.gz -C /tmp chmod +x /tmp/git-chglog /tmp/git-chglog -o docs/CHANGELOG.md --config configs/chglog/config.yml --next-tag ${{ env.NEW_TAG }} - - uses: EndBug/add-and-commit@v9 + - uses: EndBug/add-and-commit@v9.1.3 with: author_name: github-actions[bot] author_email: 41898282+github-actions[bot]@users.noreply.github.com diff --git a/.github/workflows/dive.yml b/.github/workflows/dive.yml index dabc70eb..d68c6241 100644 --- a/.github/workflows/dive.yml +++ b/.github/workflows/dive.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest name: Analyze image efficiency steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - name: Build image run: docker build -t utrecht/n3dr:${{ github.sha }} . - uses: 030/dive-action@v0.1.0 diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3dec7e67..b81e57ca 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,11 +9,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3.0.0 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3.0.0 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3.0.0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -22,7 +22,7 @@ jobs: run: echo ::set-output name=version::${GITHUB_REF#refs/tags/} - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5.1.0 with: push: true tags: utrecht/n3dr:${{ steps.version.outputs.version }} diff --git a/.github/workflows/dockle.yml b/.github/workflows/dockle.yml index a62ac54f..e3646c61 100644 --- a/.github/workflows/dockle.yml +++ b/.github/workflows/dockle.yml @@ -6,9 +6,11 @@ jobs: runs-on: ubuntu-latest name: Analyze image using dockle steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - name: Build image run: docker build -t utrecht/n3dr:${{ github.sha }} . - - uses: hands-lab/dockle-action@v1 + - uses: goodwithtech/dockle-action@v0.1.2 with: image: utrecht/n3dr:${{ github.sha }} + ignore: CIS-DI-0005,CIS-DI-0006 + accept-key: libcrypto3 diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index e8ed9903..73e97b6e 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -14,9 +14,9 @@ jobs: - os: windows-latest shasum: sha512sum steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5.0.0 with: go-version: 1.19.0 - name: Unit tests @@ -27,7 +27,7 @@ jobs: grep -v internal/app/n3dr/n3drtest |\ grep -v cmd/n3dr) if: ${{ startsWith(matrix.os, 'ubuntu') }} - - uses: codecov/codecov-action@v3 + - uses: codecov/codecov-action@v3.1.4 with: files: ./coverage.txt flags: unittests diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml index 679a82f7..c484b8b7 100644 --- a/.github/workflows/gosec.yml +++ b/.github/workflows/gosec.yml @@ -7,9 +7,9 @@ jobs: env: GO111MODULE: 'on' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5.0.0 with: go-version: 1.19.0 - name: Download gosec diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml index ca75d1bf..44c144d7 100644 --- a/.github/workflows/hadolint.yml +++ b/.github/workflows/hadolint.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest name: Analyze image using hadolint steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - uses: hadolint/hadolint-action@v1.6.0 with: dockerfile: Dockerfile diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 266b03fd..2d3c8eae 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -5,9 +5,9 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5.0.0 with: go-version: 1.19.0 - name: Install bats diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7b7cc657..eaba85cd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,11 +15,11 @@ jobs: - os: windows-latest shasum: sha512sum steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 with: ref: main - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5.0.0 with: go-version: 1.19.0 - name: Set N3DR deliverable environment variable @@ -59,14 +59,14 @@ jobs: if: ${{ startsWith(matrix.os, 'windows') }} # yamllint enable rule:line-length - name: Upload binaries to release - uses: svenstaro/upload-release-action@v2 + uses: svenstaro/upload-release-action@v2.7.0 with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: cmd/n3dr/${{ env.n3dr-deliverable }} asset_name: ${{ env.n3dr-deliverable }} tag: ${{ github.ref }} - name: Upload checksums - uses: svenstaro/upload-release-action@v2 + uses: svenstaro/upload-release-action@v2.7.0 with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: cmd/n3dr/${{ env.n3dr-deliverable }}.sha512.txt diff --git a/.github/workflows/snapcraft.yml b/.github/workflows/snapcraft.yml index 43663c07..20d6b318 100644 --- a/.github/workflows/snapcraft.yml +++ b/.github/workflows/snapcraft.yml @@ -11,17 +11,17 @@ jobs: needs: [release] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 with: ref: main - - uses: snapcore/action-build@v1 + - uses: snapcore/action-build@v1.2.0 with: path: build/package id: snapcraft - run: | sudo snap install --dangerous ${{ steps.snapcraft.outputs.snap }} n3dr --version | grep "[0-9]\." - - uses: snapcore/action-publish@v1 + - uses: snapcore/action-publish@v1.2.0 env: SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_LOGIN }} with: diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 71c20769..e8609c6d 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.1 - name: Build an image from Dockerfile run: | docker build -t utrecht/n3dr:${{ github.sha }} . diff --git a/.github/workflows/yamllint.yml b/.github/workflows/yamllint.yml index 6995b0e8..79a727db 100644 --- a/.github/workflows/yamllint.yml +++ b/.github/workflows/yamllint.yml @@ -10,6 +10,6 @@ jobs: YAMLLINT_CONFIG_FILE: /code/configs/.yamllint.yaml options: --cpus 1 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - name: run yamllint run: yamllint . diff --git a/build/package/snap/snapcraft.yaml b/build/package/snap/snapcraft.yaml index b526b3e2..fdcec6e9 100644 --- a/build/package/snap/snapcraft.yaml +++ b/build/package/snap/snapcraft.yaml @@ -1,7 +1,7 @@ --- name: n3dr base: core20 -version: 7.3.2 +version: 7.3.3 summary: Nexus3 Disaster Recovery description: | Download all artifacts at once or migrate automatically from Nexus to Nexus. diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index a4b49936..6db2a651 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -3,9 +3,13 @@ -## [7.3.3] - 2023-12-02 +## [7.3.3] - 2023-12-09 +### Build +- **deps:** [[#399](https://github.com/030/n3dr/issues/399)] Use semantic versioning for plugins in github actions. +- **deps:** bump actions/checkout from 3 to 4 ([#394](https://github.com/030/n3dr/issues/394)) + ### Fix -- https=false otherwise https was not disabled. +- https=false otherwise https was not disabled. ([#401](https://github.com/030/n3dr/issues/401)) diff --git a/docs/quickstarts/snippets/n3dr/DOWNLOAD.md b/docs/quickstarts/snippets/n3dr/DOWNLOAD.md index b9140867..867d1b66 100644 --- a/docs/quickstarts/snippets/n3dr/DOWNLOAD.md +++ b/docs/quickstarts/snippets/n3dr/DOWNLOAD.md @@ -1,12 +1,12 @@ # Download -Download the [latest N3DR binary](https://github.com/030/n3dr/releases/tag/7.3.2): +Download the [latest N3DR binary](https://github.com/030/n3dr/releases/tag/7.3.3): ```bash cd /tmp && \ -curl -L https://github.com/030/n3dr/releases/download/7.3.2/n3dr-ubuntu-latest \ +curl -L https://github.com/030/n3dr/releases/download/7.3.3/n3dr-ubuntu-latest \ -o n3dr-ubuntu-latest && \ -curl -L https://github.com/030/n3dr/releases/download/7.3.2/\ +curl -L https://github.com/030/n3dr/releases/download/7.3.3/\ n3dr-ubuntu-latest.sha512.txt \ -o n3dr-ubuntu-latest.sha512.txt && \ sha512sum -c n3dr-ubuntu-latest.sha512.txt && \