diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e414976..371fab6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,9 +4,13 @@ on: pull_request: branches: - master + paths-ignore: + - '.github/**' push: branches: - release/* + paths-ignore: + - '.github/**' workflow_dispatch: @@ -33,8 +37,7 @@ jobs: - name: Install build essential shell: bash - run: | - + run: |- curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /usr/share/keyrings/githubcli-archive-keyring.gpg echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null sudo apt-get install dirmngr -y @@ -72,43 +75,6 @@ jobs: uses: docker/metadata-action@v5 with: images: floryn90/hugo - # tags: | - # type=raw,value=base - # type=raw,value=alpine - # type=raw,value=alpine-ci - # type=raw,value=alpine-onbuild - # type=raw,value=asciidoctor - # type=raw,value=asciidoctor-ci - # type=raw,value=asciidoctor-onbuild - # type=raw,value=pandoc - # type=raw,value=pandoc-ci - # type=raw,value=pandoc-onbuild - # type=raw,value=ext-alpine - # type=raw,value=ext-alpine-ci - # type=raw,value=ext-alpine-onbuild - # type=raw,value=ext-asciidoctor - # type=raw,value=ext-asciidoctor-ci - # type=raw,value=ext-asciidoctor-onbuild - # type=raw,value=ext-pandoc - # type=raw,value=ext-pandoc-ci - # type=raw,value=ext-pandoc-onbuild - # type=raw,value=busybox - # type=raw,value=busybox-ci - # type=raw,value=busybox-onbuild - # type=raw,value=debian - # type=raw,value=debian-ci - # type=raw,value=debian-onbuild - # type=raw,value=ext-debian - # type=raw,value=latest-ext - # type=raw,value=ext-debian-ci - # type=raw,value=ext-debian-onbuild - # type=raw,value=ext-ci - # type=raw,value=ext-onbuild - # type=raw,value=ubuntu - # type=raw,value=ubuntu-ci - # type=raw,value=ubuntu-onbuild - # type=raw,value=ext-ubuntu-ci - # type=raw,value=ext-ubuntu-onbuild - name: Prepare shell: bash @@ -118,32 +84,12 @@ jobs: shell: bash run: make build - # Compare the image built in the pull request with the one in production - # - name: Docker Scout - # id: docker-scout - # uses: docker/scout-action@v1 - # with: - # image: ${{ steps.meta.outputs.tags }} - # command: cves,quickview,compare - # to: docker.io/${{ steps.meta.outputs.tags }} - # ignore-unchanged: true - # only-severities: critical,high - # organization: floryn90 - # github-token: ${{ github.token }} - - - name: Upload target content uses: actions/upload-artifact@v4 with: name: target path: target - # - name: Test Docsy - # run: sudo make test-docsy - - # - name: Test DocuAPI - # run: sudo make test-docuapi - - name: Push edge images if: "!startsWith(github.ref, 'refs/tags/')" shell: bash diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6c5135a..cdab5de 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,6 +38,12 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + - name: Docker login + uses: docker/login-action@v3 + with: + username: floryn90 + password: ${{ secrets.DOCKER_TOKEN }} + - name: Get previous release tag id: release_tag shell: bash @@ -49,55 +55,11 @@ jobs: env: GH_TOKEN: ${{ secrets.TOKEN_GITHUB }} - # - name: Docker meta - # id: meta - # uses: docker/metadata-action@v5 - # with: - # images: floryn90/hugo - # tags: | - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}} - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-base - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-alpine - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-alpine-ci - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-alpine-onbuild - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-asciidoctor - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-asciidoctor-ci - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-asciidoctor-onbuild - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-pandoc - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-pandoc-ci - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-pandoc-onbuild - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ext-alpine - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ext-alpine-ci - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ext-alpine-onbuild - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ext-asciidoctor - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ext-asciidoctor-ci - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ext-asciidoctor-onbuild - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ext-pandoc - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ext-pandoc-ci - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ext-pandoc-onbuild - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-busybox - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-busybox-ci - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-busybox-onbuild - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-debian - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-debian-ci - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-debian-onbuild - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ext-debian - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-latest-ext - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ext-debian-ci - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ext-debian-onbuild - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ext-ci - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ext-onbuild - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ubuntu - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ubuntu-ci - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ubuntu-onbuild - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ext-ubuntu-ci - # type=raw,value=${{steps.release_tag.outputs.latest_release_tag}}-ext-ubuntu-onbuild - - - name: Docker login - uses: docker/login-action@v3 + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 with: - username: floryn90 - password: ${{ secrets.DOCKER_TOKEN }} + images: floryn90/hugo - name: Prepare shell: bash @@ -113,18 +75,6 @@ jobs: name: target path: target - # Compare the image built in the pull request with the one in production - # - name: Docker Scout - # id: docker-scout - # uses: docker/scout-action@v1 - # with: - # image: ${{ steps.meta.outputs.tags }} - # command: cves,quickview,compare - # to: docker.io/${{ steps.meta.outputs.tags }} - # ignore-unchanged: true - # only-severities: critical,high - # organization: floryn90 - - name: Push images if: startsWith(github.ref, 'refs/tags/') shell: bash diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 9949577..e15eae5 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -4,9 +4,14 @@ on: push: branches: - release/* + paths-ignore: + - '.github/**' pull_request: branches: - master + paths-ignore: + - '.github/**' + workflow_dispatch: permissions: diff --git a/Makefile b/Makefile index 934e35d..a5737a0 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ bump: @RELEASE=$(version) bump src/bin/buildx: - @wget -q -O src/bin/buildx https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64 + @wget -q -O src/bin/buildx https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64 @chmod a+x src/bin/buildx @docker buildx create --use diff --git a/src/files/_script/golang.sh b/src/files/_script/golang.sh index 71f1080..876d688 100644 --- a/src/files/_script/golang.sh +++ b/src/files/_script/golang.sh @@ -6,7 +6,7 @@ set -e set -u # Variables -GOLANG_VERSION="1.22.5" +GOLANG_VERSION="1.23.0" # Architecture TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64} diff --git a/src/files/_script/nodejs-glibc.sh b/src/files/_script/nodejs-glibc.sh index 2fc0dfb..17f4b4d 100644 --- a/src/files/_script/nodejs-glibc.sh +++ b/src/files/_script/nodejs-glibc.sh @@ -6,7 +6,7 @@ set -e set -u # Variables -NODE_VERSION="22.4.0" +NODE_VERSION="22.7.0" # Architecture TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64} diff --git a/src/files/_script/nodejs-musl.sh b/src/files/_script/nodejs-musl.sh index 4b7e282..0d74fca 100644 --- a/src/files/_script/nodejs-musl.sh +++ b/src/files/_script/nodejs-musl.sh @@ -6,7 +6,7 @@ set -e set -u # Variables -NODE_VERSION="22.4.0" +NODE_VERSION="22.7.0" # Architecture TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64} diff --git a/src/files/_script/pandoc.sh b/src/files/_script/pandoc.sh index 981a91e..f54c678 100644 --- a/src/files/_script/pandoc.sh +++ b/src/files/_script/pandoc.sh @@ -6,7 +6,7 @@ set -e set -u # Variables -PANDOC_VERSION="3.2.1" +PANDOC_VERSION="3.3" # Architecture TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}