From 9901b8ccef4bf3a59750b946402f81b30cd79f91 Mon Sep 17 00:00:00 2001 From: Giles Westwood Date: Fri, 29 Nov 2024 00:34:29 +0000 Subject: [PATCH 1/3] chore: add bld_docker workflow to main so we can test on branch --- .github/workflows/bld_docker.yml | 159 +++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 .github/workflows/bld_docker.yml diff --git a/.github/workflows/bld_docker.yml b/.github/workflows/bld_docker.yml new file mode 100644 index 0000000000..e1fd22d548 --- /dev/null +++ b/.github/workflows/bld_docker.yml @@ -0,0 +1,159 @@ +name: bld_docker + +permissions: + checks: write + contents: read + issues: read + pull-requests: write + +on: + workflow_call: + inputs: + docker_name: + description: 'Name of the docker image to build' + required: false + default: "orcid/version-bumping-test" + type: string + context: + description: 'Name of the context in the repo' + required: false + default: "." + type: string + build_args: + description: 'build_args e.g wibble=blar' + required: false + default: "" + type: string + file: + description: 'specify a custom dockerfile' + required: false + default: "" + type: string + version_tag: + description: 'Name of the tag to build' + required: false + default: 'latest' + type: string + bump: + description: 'whether to bump the version number by a major minor patch amount or none' + required: false + default: 'patch' + type: string + ref: + description: 'git reference to use with the checkout use default_branch to have that calculated' + required: false + default: "default" + type: string + push: + description: 'Select to push to docker registry' + required: false + default: true + type: boolean + + workflow_dispatch: + inputs: + docker_name: + description: 'Name of the docker image to build' + required: false + default: "orcid/version-bumping-test" + type: string + context: + description: 'Name of the context in the repo' + required: false + default: "." + type: string + build_args: + description: 'build_args e.g wibble=blar' + required: false + default: "" + type: string + file: + description: 'specify a custom dockerfile' + required: false + default: "" + type: string + version_tag: + description: 'Name of the tag to build' + required: false + default: 'latest' + type: string + bump: + description: 'whether to bump the version number by a major minor patch amount or none' + required: false + default: 'patch' + type: string + ref: + description: 'git reference to use with the checkout use default_branch to have that calculated' + required: false + default: "default" + type: string + push: + description: 'Select to push to docker registry' + required: false + default: true + type: boolean + +jobs: + bld_docker: + strategy: + matrix: + include: + - artifact_name: orcid-web + docker_name: orcid/registry/orcid-web + file: orcid-web/Dockerfile + + - artifact_name: orcid-web-proxy + docker_name: orcid/registry/orcid-web-proxy + file: orcid-web-proxy/Dockerfile + + runs-on: ubuntu-latest + steps: + - name: git-checkout-ref-action + id: ref + uses: ORCID/git-checkout-ref-action@main + with: + default_branch: ${{ github.event.repository.default_branch }} + ref: ${{ inputs.ref }} + + - uses: actions/checkout@v4 + with: + ref: ${{ steps.ref.outputs.ref }} + # checkout some history so we can scan commits for bump messages + # NOTE: history does not include tags! + fetch-depth: 100 + + - name: find next version + id: version + uses: ORCID/version-bump-action@main + with: + version_tag: ${{ inputs.version_tag }} + bump: ${{ inputs.bump }} + + - uses: docker/setup-buildx-action@v3 + + - name: Login to private registry + uses: docker/login-action@v3 + with: + registry: ${{ secrets.DOCKER_REG_PRIVATE }} + username: ${{ secrets.DOCKER_USER }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: nasty hack to allow dynamic defaults + id: dynamic_defaults + run: | + FILE="${{ matrix.file }}" + echo "default_file=${FILE:-${{ inputs.context }}/Dockerfile}" >> "$GITHUB_OUTPUT" + + - name: show the dynamic defaults + run: | + echo ${{ steps.dynamic_defaults.outputs.default_file }} + + - uses: docker/build-push-action@v6 + with: + push: ${{ inputs.push }} + tags: ${{ secrets.DOCKER_REG_PRIVATE }}/${{ matrix.docker_name}}:${{ steps.version.outputs.version_tag_numeric }} + context: ${{ inputs.context }} + cache-from: type=registry,ref=${{ secrets.DOCKER_REG_PRIVATE }}/${{ matrix.docker_name }}:cache + cache-to: type=registry,mode=max,image-manifest=true,oci-mediatypes=true,ref=${{ secrets.DOCKER_REG_PRIVATE }}/${{ matrix.docker_name }}:cache + file: ${{ steps.dynamic_defaults.outputs.default_file }} + From 5a6abd7e835425c63ba78142a77a34801d86a670 Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Mon, 2 Dec 2024 23:18:01 +0200 Subject: [PATCH 2/3] bump orcid model version (#7148) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 815ab3fd68..81785f3f61 100644 --- a/pom.xml +++ b/pom.xml @@ -921,7 +921,7 @@ the software. org.orcid orcid-model - 3.3.3 + 3.3.4 org.orcid From 8d7c2e573d989650092c938b21eb862d319f9754 Mon Sep 17 00:00:00 2001 From: github actions Date: Mon, 2 Dec 2024 21:34:12 +0000 Subject: [PATCH 3/3] v2.68.13 changelog update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a8dfabdd0..d63ecfc369 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v2.68.13 - 2024-12-02 + +[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.68.12...v2.68.13) + ## v2.68.12 - 2024-11-26 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.68.11...v2.68.12)