diff --git a/.github/workflows/release-docker-image-euid.yaml b/.github/workflows/release-docker-image-euid.yaml deleted file mode 100644 index 94c06aa..0000000 --- a/.github/workflows/release-docker-image-euid.yaml +++ /dev/null @@ -1,23 +0,0 @@ -name: Release EUID TCPORTAL Image -run-name: ${{ inputs.release_type == 'Snapshot' && 'Publish Pre-release' || format('Release {0}', inputs.release_type)}} EUID Docker Image by @${{ github.actor }} -on: - workflow_dispatch: - inputs: - release_type: - type: choice - description: 'The type of release' - options: - - Major - - Minor - - Patch - - Snapshot - -jobs: - Image: - uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-publish-to-docker-versioned.yaml@v2 - with: - release_type: ${{ inputs.release_type }} - docker_file: Dockerfile_euid - docker_image_name: iabtechlab/euid-tcportal - docker_registry: ghcr.io - secrets: inherit diff --git a/.github/workflows/release-docker-image-uid2.yaml b/.github/workflows/release-docker-image-uid2.yaml deleted file mode 100644 index f17fc6e..0000000 --- a/.github/workflows/release-docker-image-uid2.yaml +++ /dev/null @@ -1,23 +0,0 @@ -name: Release UID2 TCPORTAL Image -run-name: ${{ inputs.release_type == 'Snapshot' && 'Publish Pre-release' || format('Release {0}', inputs.release_type)}} UID2 Docker Image by @${{ github.actor }} -on: - workflow_dispatch: - inputs: - release_type: - type: choice - description: 'The type of release' - options: - - Major - - Minor - - Patch - - Snapshot - -jobs: - Image: - uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-publish-to-docker-versioned.yaml@v2 - with: - release_type: ${{ inputs.release_type }} - docker_file: Dockerfile_uid2 - docker_image_name: iabtechlab/uid2-tcportal - docker_registry: ghcr.io - secrets: inherit diff --git a/.github/workflows/release-docker-image.yaml b/.github/workflows/release-docker-image.yaml new file mode 100644 index 0000000..2074010 --- /dev/null +++ b/.github/workflows/release-docker-image.yaml @@ -0,0 +1,45 @@ +name: Release TCPORTAL Image +run-name: ${{ inputs.release_type == 'Snapshot' && 'Publish Pre-release' || format('Release {0}', inputs.release_type)}} Docker Image by @${{ github.actor }} +on: + workflow_dispatch: + inputs: + release_type: + type: choice + description: 'The type of release' + options: + - Major + - Minor + - Patch + - Snapshot + pull_request: + +jobs: + incrementVersionNumber: + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-increase-version-number.yaml@v2 + with: + release_type: ${{ inputs.release_type }} + secrets: inherit + + publishToUID2: + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-publish-to-docker-versioned.yaml@v2 + needs: incrementVersionNumber + with: + new_version: ${{ needs.incrementVersionNumber.outputs.new_version }} + image_tag: ${{ needs.incrementVersionNumber.outputs.image_tag }} + release_type: ${{ inputs.release_type }} + docker_file: Dockerfile_uid2 + docker_image_name: iabtechlab/uid2-tcportal + docker_registry: ghcr.io + secrets: inherit + + publishToEUID: + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-publish-to-docker-versioned.yaml@v2 + needs: incrementVersionNumber + with: + new_version: ${{ needs.incrementVersionNumber.outputs.new_version }} + image_tag: ${{ needs.incrementVersionNumber.outputs.image_tag }} + release_type: ${{ inputs.release_type }} + docker_file: Dockerfile_euid + docker_image_name: iabtechlab/euid-tcportal + docker_registry: ghcr.io + secrets: inherit diff --git a/package.json b/package.json index 224dc51..a93d4fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tc-portal", - "version": "1.3.1-e95732731f", + "version": "1.3.1", "private": true, "engineStrict": true, "scripts": {