From 7f3ee5b178a2dd83d1be15b7c672a8cb5ace17f7 Mon Sep 17 00:00:00 2001 From: Sergey Nazarov Date: Tue, 25 Nov 2025 15:01:47 +0300 Subject: [PATCH 1/2] Bumped node version --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 0358af1e..d61d1c47 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ import com.github.sbt.git.SbtGit.GitKeys.gitCurrentBranch enablePlugins(UniversalDeployPlugin, GitVersioning, sbtdocker.DockerPlugin, VersionObject) git.useGitDescribe := true -git.baseVersion := "1.1.0" +git.baseVersion := "1.3.0" git.uncommittedSignifier := Some("DIRTY") inScope(Global)( @@ -33,7 +33,7 @@ name := "consensus-client" maintainer := "Units Network Team" libraryDependencies ++= { - val node = "1.5.12-SNAPSHOT" + val node = "1.5.12" val sttpVersion = "3.11.0" Seq( "com.wavesplatform" % "node-testkit" % node % Test, From a6f540eb147dbfcb3674f2f6de4561e96305b2ed Mon Sep 17 00:00:00 2001 From: Sergey Nazarov Date: Tue, 25 Nov 2025 15:15:41 +0300 Subject: [PATCH 2/2] wip --- .github/workflows/publish-docker-image.yml | 71 +++++++++++++++------- 1 file changed, 48 insertions(+), 23 deletions(-) diff --git a/.github/workflows/publish-docker-image.yml b/.github/workflows/publish-docker-image.yml index 4ad999d7..a49aadcc 100644 --- a/.github/workflows/publish-docker-image.yml +++ b/.github/workflows/publish-docker-image.yml @@ -1,13 +1,13 @@ name: Publish Docker image -run-name: Publish branch ${{ github.ref_name }} to tags ${{ inputs.dockerTags }} +run-name: Publish branch ${{ github.ref_name }} to tags ${{ inputs.docker-tags }} on: workflow_dispatch: inputs: - dockerTags: + docker-tags: description: 'Docker tag' required: true - baseImage: + base-image: description: 'Base image' required: true default: 'ghcr.io/wavesplatform/waves:snapshot' @@ -25,24 +25,46 @@ jobs: id-token: write steps: - uses: actions/checkout@v4 + - uses: regclient/actions/regctl-installer@4d6888fcc4842c9630f60ebc91715a45dd9bd7a3 - uses: proudust/gh-describe@70f72d4f6304ea053cf5a3d71c36211d5acc0c73 id: ghd - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: '11' - cache: 'sbt' - - uses: sbt/setup-sbt@v1 + - name: Prepare base image and consensus client version + run: | + BASE_IMAGE=${{ inputs.base-image }} + BASE_IMAGE=${BASE_IMAGE:-$(head -n1 docker/Dockerfile | cut -d= -f2-)} + echo "base-image=$BASE_IMAGE" >> "$GITHUB_OUTPUT" + echo "base-image-digest=$(regctl manifest digest $BASE_IMAGE)" >> "$GITHUB_OUTPUT" + echo "cc-version=$(echo ${{ steps.ghd.outputs.describe }} | cut -c 2-)" >> "$GITHUB_OUTPUT" + id: versions - run: | { echo 'tags<> "$GITHUB_OUTPUT" - echo "cc-version=$(echo ${{ steps.ghd.outputs.describe }} | cut -c 2-)" >> "$GITHUB_OUTPUT" id: tag-list - - run: sbt -Dproject.version=${{ steps.tag-list.outputs.cc-version }} --batch buildTarballsForDocker + - name: Prepare annotations + run: | + { + echo 'annotations<> "$GITHUB_OUTPUT" + id: annotations + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '11' + cache: 'sbt' + - uses: sbt/setup-sbt@v1 + - run: sbt -Dproject.version=${{ steps.versions.outputs.cc-version }} --batch buildTarballsForDocker - uses: docker/login-action@v3 with: registry: ghcr.io @@ -52,16 +74,13 @@ jobs: - uses: docker/metadata-action@v5 id: meta env: - DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index + DOCKER_METADATA_ANNOTATIONS_LEVELS: index,manifest-descriptor,index-descriptor with: images: ${{ env.IMAGE_NAME }} - flavor: latest=${{ contains(inputs.dockerTags, 'latest') }} - tags: | - ${{ steps.tag-list.outputs.tags }} - labels: | - org.opencontainers.image.source=https://github.com/${{ github.repository }} - org.opencontainers.image.licenses=MIT - org.opencontainers.image.description=Unit Zero Node + flavor: latest=${{ contains(inputs.docker-tags, 'latest') }} + tags: ${{ steps.tag-list.outputs.tags }} + annotations: ${{ steps.annotations.outputs.annotations }} + labels: ${{ steps.annotations.outputs.annotations }} - uses: docker/build-push-action@v5 id: push with: @@ -69,11 +88,17 @@ jobs: platforms: linux/amd64,linux/arm64 push: true pull: true - build-args: baseImage=${{ inputs.baseImage }} + build-args: baseImage=${{ steps.versions.outputs.base-image }}@${{ steps.versions.outputs.base-image-digest }} tags: ${{ steps.meta.outputs.tags }} annotations: ${{ steps.meta.outputs.annotations }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max - - run: | - echo 'Base image: `${{ inputs.baseImage }}`' >> $GITHUB_STEP_SUMMARY + - name: Prepare summary + run: | + { + echo '## Image Info' + echo '- This image: `${{ env.IMAGE_NAME }}@${{ steps.push.outputs.digest }}`' + echo '- Base image: `${{ steps.versions.outputs.base-image }}@${{ steps.versions.outputs.base-image-digest }}`' + echo '- Version: `${{ steps.versions.outputs.cc-version }}`' + } >> $GITHUB_STEP_SUMMARY