From 75969455fdc64c762a74e23c8bd9984b32012bbe Mon Sep 17 00:00:00 2001 From: Thomas Manson Date: Fri, 20 Sep 2024 13:57:21 +1000 Subject: [PATCH 1/4] Remove ./ from download path for artifact --- .github/actions/build_ami/action.yaml | 2 +- .github/actions/build_eks_docker_image/action.yaml | 2 +- .github/actions/download_release_artifact/action.yaml | 8 ++++---- .github/workflows/build-uid2-ami.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/actions/build_ami/action.yaml b/.github/actions/build_ami/action.yaml index 5845886f0..31d990219 100644 --- a/.github/actions/build_ami/action.yaml +++ b/.github/actions/build_ami/action.yaml @@ -56,7 +56,7 @@ runs: uses: actions/checkout@v4 - name: Get EIF for Release ${{ inputs.operator_release }} - uses: IABTechLab/uid2-operator/.github/actions/download_release_artifact@main + uses: IABTechLab/uid2-operator/.github/actions/download_release_artifact@tjm-UID2-4116-fix-release-builds if: ${{ inputs.operator_release != '' }} with: github_token: ${{ inputs.github_token }} diff --git a/.github/actions/build_eks_docker_image/action.yaml b/.github/actions/build_eks_docker_image/action.yaml index ffe0fd10e..c85d1c00c 100644 --- a/.github/actions/build_eks_docker_image/action.yaml +++ b/.github/actions/build_eks_docker_image/action.yaml @@ -47,7 +47,7 @@ runs: mkdir ${{ inputs.artifacts_output_dir }} -p - name: Get EIF for Release ${{ inputs.operator_release }} - uses: IABTechLab/uid2-operator/.github/actions/download_release_artifact@main + uses: IABTechLab/uid2-operator/.github/actions/download_release_artifact@tjm-UID2-4116-fix-release-builds if: ${{ inputs.operator_release != '' }} with: github_token: ${{ inputs.github_token }} diff --git a/.github/actions/download_release_artifact/action.yaml b/.github/actions/download_release_artifact/action.yaml index 13e38aafd..3ad54d6bf 100644 --- a/.github/actions/download_release_artifact/action.yaml +++ b/.github/actions/download_release_artifact/action.yaml @@ -68,16 +68,16 @@ runs: run: | echo 'Asset URL: ${{ steps.get_asset_id.outputs.result }}' - mkdir -p ./${{ inputs.folder }} + mkdir -p ${{ inputs.folder }} DOWNLOAD_PATH=${{ steps.get_asset_id.outputs.result }} echo $DOWNLOAD_PATH curl -L -H "Accept: application/octet-stream" \ -H "Authorization: Bearer ${{ inputs.github_token }}" \ - -o "./${{ inputs.folder }}/${{ inputs.artifact_name }}.zip" \ + -o "${{ inputs.folder }}/${{ inputs.artifact_name }}.zip" \ $DOWNLOAD_PATH - name: Unzip artifacts shell: bash run: | - unzip -o -d './${{ inputs.folder }}' './${{ inputs.folder }}/${{ inputs.artifact_name }}.zip' - rm './${{ inputs.folder }}/${{ inputs.artifact_name }}.zip' + unzip -o -d '${{ inputs.folder }}' '${{ inputs.folder }}/${{ inputs.artifact_name }}.zip' + rm '${{ inputs.folder }}/${{ inputs.artifact_name }}.zip' diff --git a/.github/workflows/build-uid2-ami.yaml b/.github/workflows/build-uid2-ami.yaml index 38f300a15..4d705b849 100644 --- a/.github/workflows/build-uid2-ami.yaml +++ b/.github/workflows/build-uid2-ami.yaml @@ -37,7 +37,7 @@ jobs: - name: Build UID2 Operator AMI id: buildAMI - uses: IABTechLab/uid2-operator/.github/actions/build_ami@main + uses: IABTechLab/uid2-operator/.github/actions/build_ami@tjm-UID2-4116-fix-release-builds with: identity_scope: uid2 eif_repo_owner: ${{ env.REPO_OWNER }} @@ -74,7 +74,7 @@ jobs: - name: Build EUID Operator AMI id: buildAMI - uses: IABTechLab/uid2-operator/.github/actions/build_ami@main + uses: IABTechLab/uid2-operator/.github/actions/build_ami@tjm-UID2-4116-fix-release-builds with: identity_scope: euid eif_repo_owner: ${{ env.REPO_OWNER }} From 1b64fb2e108419b29c84ac8609cf919d0d477a6f Mon Sep 17 00:00:00 2001 From: Thomas Manson Date: Fri, 20 Sep 2024 14:01:15 +1000 Subject: [PATCH 2/4] Use branch version of action --- .github/workflows/publish-aws-eks-nitro-enclave-docker.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-aws-eks-nitro-enclave-docker.yaml b/.github/workflows/publish-aws-eks-nitro-enclave-docker.yaml index a4f9e2367..89497e316 100644 --- a/.github/workflows/publish-aws-eks-nitro-enclave-docker.yaml +++ b/.github/workflows/publish-aws-eks-nitro-enclave-docker.yaml @@ -38,7 +38,7 @@ jobs: steps: - name: Build Docker Image for EKS Pod id: build_docker_image_uid - uses: IABTechLab/uid2-operator/.github/actions/build_eks_docker_image@main + uses: IABTechLab/uid2-operator/.github/actions/build_eks_docker_image@tjm-UID2-4116-fix-release-builds with: identity_scope: uid2 artifacts_output_dir: ${{ env.ARTIFACTS_BASE_OUTPUT_DIR }}/uid2 @@ -62,7 +62,7 @@ jobs: steps: - name: Build Docker Image for EKS Pod id: build_docker_image_euid - uses: IABTechLab/uid2-operator/.github/actions/build_eks_docker_image@main + uses: IABTechLab/uid2-operator/.github/actions/build_eks_docker_image@tjm-UID2-4116-fix-release-builds with: identity_scope: euid artifacts_output_dir: ${{ env.ARTIFACTS_BASE_OUTPUT_DIR }}/euid From 043f32ae4ee326b5e386dd9d623bb8be40e87aea Mon Sep 17 00:00:00 2001 From: Thomas Manson Date: Fri, 20 Sep 2024 14:13:58 +1000 Subject: [PATCH 3/4] Update references back to main --- .github/actions/build_ami/action.yaml | 2 +- .github/actions/build_eks_docker_image/action.yaml | 2 +- .github/workflows/build-uid2-ami.yaml | 4 ++-- .github/workflows/publish-aws-eks-nitro-enclave-docker.yaml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/build_ami/action.yaml b/.github/actions/build_ami/action.yaml index 31d990219..5845886f0 100644 --- a/.github/actions/build_ami/action.yaml +++ b/.github/actions/build_ami/action.yaml @@ -56,7 +56,7 @@ runs: uses: actions/checkout@v4 - name: Get EIF for Release ${{ inputs.operator_release }} - uses: IABTechLab/uid2-operator/.github/actions/download_release_artifact@tjm-UID2-4116-fix-release-builds + uses: IABTechLab/uid2-operator/.github/actions/download_release_artifact@main if: ${{ inputs.operator_release != '' }} with: github_token: ${{ inputs.github_token }} diff --git a/.github/actions/build_eks_docker_image/action.yaml b/.github/actions/build_eks_docker_image/action.yaml index c85d1c00c..ffe0fd10e 100644 --- a/.github/actions/build_eks_docker_image/action.yaml +++ b/.github/actions/build_eks_docker_image/action.yaml @@ -47,7 +47,7 @@ runs: mkdir ${{ inputs.artifacts_output_dir }} -p - name: Get EIF for Release ${{ inputs.operator_release }} - uses: IABTechLab/uid2-operator/.github/actions/download_release_artifact@tjm-UID2-4116-fix-release-builds + uses: IABTechLab/uid2-operator/.github/actions/download_release_artifact@main if: ${{ inputs.operator_release != '' }} with: github_token: ${{ inputs.github_token }} diff --git a/.github/workflows/build-uid2-ami.yaml b/.github/workflows/build-uid2-ami.yaml index 4d705b849..38f300a15 100644 --- a/.github/workflows/build-uid2-ami.yaml +++ b/.github/workflows/build-uid2-ami.yaml @@ -37,7 +37,7 @@ jobs: - name: Build UID2 Operator AMI id: buildAMI - uses: IABTechLab/uid2-operator/.github/actions/build_ami@tjm-UID2-4116-fix-release-builds + uses: IABTechLab/uid2-operator/.github/actions/build_ami@main with: identity_scope: uid2 eif_repo_owner: ${{ env.REPO_OWNER }} @@ -74,7 +74,7 @@ jobs: - name: Build EUID Operator AMI id: buildAMI - uses: IABTechLab/uid2-operator/.github/actions/build_ami@tjm-UID2-4116-fix-release-builds + uses: IABTechLab/uid2-operator/.github/actions/build_ami@main with: identity_scope: euid eif_repo_owner: ${{ env.REPO_OWNER }} diff --git a/.github/workflows/publish-aws-eks-nitro-enclave-docker.yaml b/.github/workflows/publish-aws-eks-nitro-enclave-docker.yaml index 89497e316..a4f9e2367 100644 --- a/.github/workflows/publish-aws-eks-nitro-enclave-docker.yaml +++ b/.github/workflows/publish-aws-eks-nitro-enclave-docker.yaml @@ -38,7 +38,7 @@ jobs: steps: - name: Build Docker Image for EKS Pod id: build_docker_image_uid - uses: IABTechLab/uid2-operator/.github/actions/build_eks_docker_image@tjm-UID2-4116-fix-release-builds + uses: IABTechLab/uid2-operator/.github/actions/build_eks_docker_image@main with: identity_scope: uid2 artifacts_output_dir: ${{ env.ARTIFACTS_BASE_OUTPUT_DIR }}/uid2 @@ -62,7 +62,7 @@ jobs: steps: - name: Build Docker Image for EKS Pod id: build_docker_image_euid - uses: IABTechLab/uid2-operator/.github/actions/build_eks_docker_image@tjm-UID2-4116-fix-release-builds + uses: IABTechLab/uid2-operator/.github/actions/build_eks_docker_image@main with: identity_scope: euid artifacts_output_dir: ${{ env.ARTIFACTS_BASE_OUTPUT_DIR }}/euid From a292d3ff0645c190fbf8a49f66a8c76c51f27df2 Mon Sep 17 00:00:00 2001 From: Thomas Manson Date: Fri, 20 Sep 2024 14:36:34 +1000 Subject: [PATCH 4/4] Update the run name --- .github/workflows/build-uid2-ami.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-uid2-ami.yaml b/.github/workflows/build-uid2-ami.yaml index 38f300a15..4c38dd988 100644 --- a/.github/workflows/build-uid2-ami.yaml +++ b/.github/workflows/build-uid2-ami.yaml @@ -1,5 +1,7 @@ name: Build UID2 and EUID AMIs -run-name: Build UID2 and EUID AMIs for Operator Release ${{ inputs.operator_release }} by @${{ github.actor }} +run-name: >- + ${{ inputs.operator_release == '' && format('Build UID2 and EUID AMIs for Operator Run Number: {0} by {1}', inputs.operator_run_number, github.actor) || format('Build UID2 and EUID AMIs for Operator Release: {0} by {1}', inputs.operator_release, github.actor) }} + on: workflow_dispatch: inputs: