From 0b727200331c9ea21703ce3a788ab5f38e708bb8 Mon Sep 17 00:00:00 2001 From: Homing So Date: Thu, 23 May 2024 18:14:34 +0800 Subject: [PATCH] feat: v1.3.0 released Signed-off-by: Homing So --- .github/workflows/docker-publish.yml | 15 +++++++-------- CMakeLists.txt | 4 ++-- docker/docker-bake.hcl | 6 +++--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index e08c66b..7ef7062 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -31,7 +31,6 @@ jobs: strategy: matrix: registry: ${{fromJSON(needs.set-matrix.outputs.matrix)}} - alpine: [ 3.16, 3.17 ] env: id: ${{ secrets[matrix.registry.id] }} @@ -43,10 +42,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Log into Registry ${{ matrix.registry.name }} - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ matrix.registry.registry }} username: ${{ env.id }} @@ -54,17 +53,17 @@ jobs: - name: Set Up QEMU id: qemu - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set Up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 with: install: true - name: Build and Push ${{ matrix.registry.name }} run: | - REPO=${{ matrix.registry.push_link }} ALPINE_VERSION=${{ matrix.alpine }} VERSION=${{ needs.set-matrix.outputs.git_tag }} docker buildx bake --file docker/docker-bake.hcl --push --set "*.platform=linux/arm64,linux/amd64,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6" + REPO=${{ matrix.registry.push_link }} VERSION=${{ needs.set-matrix.outputs.git_tag }} docker buildx bake --file docker/docker-bake.hcl --push --set "*.platform=linux/arm64,linux/amd64,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6" release: runs-on: ubuntu-latest @@ -76,10 +75,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 if: startsWith(github.ref, 'refs/tags/') with: generate_release_notes: true \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 3220029..2ebdd94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,8 @@ if (POLICY CMP0054) endif () set(LIB_MAJOR_VERSION "1") -set(LIB_MINOR_VERSION "2") -set(LIB_PATCH_VERSION "2") +set(LIB_MINOR_VERSION "3") +set(LIB_PATCH_VERSION "0") set(LIB_VERSION_STRING "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}.${LIB_PATCH_VERSION}") if (CMAKE_VERSION VERSION_LESS 3.0) diff --git a/docker/docker-bake.hcl b/docker/docker-bake.hcl index 65f8d85..14df8b1 100644 --- a/docker/docker-bake.hcl +++ b/docker/docker-bake.hcl @@ -11,7 +11,7 @@ variable "AUTHOR_EMAIL" { } variable "ALPINE_VERSION" { - default = "3.16" + default = "latest" } variable "VERSION" { @@ -34,8 +34,8 @@ target "neujson-alpine" { VERSION = "${VERSION}" } tags = [ - "${REPO}/neujson:alpine-${ALPINE_VERSION}-latest", - notequal("", VERSION) ? "${REPO}/neujson:alpine-${ALPINE_VERSION}-${VERSION}" : "", + "${REPO}/neujson:latest", + notequal("", VERSION) ? "${REPO}/neujson:${VERSION}" : "", ] platforms = ["linux/amd64"] } \ No newline at end of file