Skip to content

Commit

Permalink
UID2-2861 fix GitHub warnings (#367)
Browse files Browse the repository at this point in the history
* Use kcc-UID2-2861-fix-github-warnings for testing

* Revert kcc-UID2-2861-fix-github-warnings to v2

* Update versions to get rid of github warnings
  • Loading branch information
cYKatherine authored Feb 28, 2024
1 parent 071fa86 commit bfbffd6
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e-azure-cc-enclave.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
cd ./e2e && bash ./setup_ngrok.sh
- name: Log in to the Docker container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-gcp-oidc-enclave.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
cd ./e2e && bash ./prepare_gcp_enclave_metadata.sh
- name: Log in to the Docker container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-all-operators.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
azure-cc-deployment-files
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: uid2-operator-release-${{ needs.start.outputs.new_version }}
path: ./artifacts/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-aws-nitro-enclave-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ jobs:
steps:
- name: Check branch and release type
id: checkRelease
uses: IABTechLab/uid2-shared-actions/actions/check_branch_and_release_type@v2.2.2
uses: IABTechLab/uid2-shared-actions/actions/check_branch_and_release_type@v2
with:
release_type: ${{ inputs.release_type }}
30 changes: 13 additions & 17 deletions .github/workflows/publish-azure-cc-enclave-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
steps:
- name: Check branch and release type
id: checkRelease
uses: IABTechLab/uid2-shared-actions/actions/check_branch_and_release_type@v2.2.2
uses: IABTechLab/uid2-shared-actions/actions/check_branch_and_release_type@v2
with:
release_type: ${{ inputs.release_type }}

Expand All @@ -65,10 +65,10 @@ jobs:
shell: bash
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
IS_RELEASE: ${{ steps.checkRelease.outputs.IS_RELEASE }}
IS_RELEASE: ${{ steps.checkRelease.outputs.is_release }}

- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
Expand All @@ -89,7 +89,7 @@ jobs:
fetch-depth: 0

- name: Restore timestamps
uses: thetradedesk/git-restore-mtime-action@v1.2
uses: thetradedesk/git-restore-mtime-action@v1.3

- name: Set version number
id: version
Expand Down Expand Up @@ -117,23 +117,19 @@ jobs:
cp -r target ${{ env.DOCKER_CONTEXT_PATH }}/
- name: Commit pom.xml and version.json
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.IS_RELEASE != 'true' }}
uses: EndBug/add-and-commit@v9
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.is_release != 'true' }}
uses: IABTechLab/uid2-shared-actions/actions/commit_pr_and_merge@v2
with:
add: 'pom.xml version.json'
author_name: Release Workflow
author_email: [email protected]
message: 'Released ${{ inputs.release_type }} version: ${{ steps.version.outputs.new_version }}'

- name: Commit pom.xml, version.json and set tag
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.IS_RELEASE == 'true' }}
uses: EndBug/add-and-commit@v9
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.is_release == 'true' }}
uses: IABTechLab/uid2-shared-actions/actions/commit_pr_and_merge@v2
with:
add: 'pom.xml version.json'
author_name: Release Workflow
author_email: [email protected]
message: 'Released ${{ inputs.release_type }} version: ${{ steps.version.outputs.new_version }}'
tag: v${{ steps.version.outputs.new_version }}
tag: v${{ steps.version.outputs.new_version }}

- name: Log in to the Docker container registry
uses: docker/login-action@v3
Expand Down Expand Up @@ -208,20 +204,20 @@ jobs:
bash ./scripts/azure-cc/deployment/generate-deployment-artifacts.sh
- name: Archive deployment artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: azure-cc-deployment-files
path: |
${{ env.ARTIFACTS_OUTPUT_DIR }}
- name: Generate release archive
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.IS_RELEASE == 'true' }}
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.is_release == 'true' }}
run: |
zip -j ${{ env.ARTIFACTS_OUTPUT_DIR }}/uid2-operator-deployment-artifacts-${{ steps.meta.outputs.version }}.zip ${{ env.ARTIFACTS_OUTPUT_DIR }}/*
- name: Build Changelog
id: github_release
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.IS_RELEASE == 'true' }}
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.is_release == 'true' }}
uses: mikepenz/release-changelog-builder-action@v3
with:
configurationJson: |
Expand All @@ -233,7 +229,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Create Release
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.IS_RELEASE == 'true' }}
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.is_release == 'true' }}
uses: softprops/action-gh-release@v1
with:
name: ${{ steps.version.outputs.new_version }}
Expand Down
26 changes: 11 additions & 15 deletions .github/workflows/publish-gcp-oidc-enclave-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ jobs:
shell: bash
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
IS_RELEASE: ${{ steps.checkRelease.outputs.IS_RELEASE }}
IS_RELEASE: ${{ steps.checkRelease.outputs.is_release }}

- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
Expand All @@ -91,7 +91,7 @@ jobs:
fetch-depth: 0

- name: Restore timestamps
uses: thetradedesk/git-restore-mtime-action@v1.2
uses: thetradedesk/git-restore-mtime-action@v1.3

- name: Set version number
id: version
Expand Down Expand Up @@ -119,21 +119,17 @@ jobs:
cp -r target ${{ env.DOCKER_CONTEXT_PATH }}/
- name: Commit pom.xml and version.json
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.IS_RELEASE != 'true' }}
uses: EndBug/add-and-commit@v9
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.is_release != 'true' }}
uses: IABTechLab/uid2-shared-actions/actions/commit_pr_and_merge@v2
with:
add: 'pom.xml version.json'
author_name: Release Workflow
author_email: [email protected]
message: 'Released ${{ inputs.release_type }} version: ${{ steps.version.outputs.new_version }}'

- name: Commit pom.xml, version.json and set tag
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.IS_RELEASE == 'true' }}
uses: EndBug/add-and-commit@v9
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.is_release == 'true' }}
uses: IABTechLab/uid2-shared-actions/actions/commit_pr_and_merge@v2
with:
add: 'pom.xml version.json'
author_name: Release Workflow
author_email: [email protected]
message: 'Released ${{ inputs.release_type }} version: ${{ steps.version.outputs.new_version }}'
tag: v${{ steps.version.outputs.new_version }}

Expand Down Expand Up @@ -245,20 +241,20 @@ jobs:
bash ./scripts/gcp-oidc/generate-deployment-artifacts.sh
- name: Archive deployment artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: gcp-oidc-deployment-files
path: |
${{ env.ARTIFACTS_OUTPUT_DIR }}
- name: Generate release archive
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.IS_RELEASE == 'true' }}
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.is_release == 'true' }}
run: |
zip -j ${{ env.ARTIFACTS_OUTPUT_DIR }}/uid2-operator-deployment-artifacts-${{ steps.meta.outputs.version }}.zip ${{ env.ARTIFACTS_OUTPUT_DIR }}/*
- name: Build Changelog
id: github_release
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.IS_RELEASE == 'true' }}
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.is_release == 'true' }}
uses: mikepenz/release-changelog-builder-action@v3
with:
configurationJson: |
Expand All @@ -270,7 +266,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Create Release
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.IS_RELEASE == 'true' }}
if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.is_release == 'true' }}
uses: softprops/action-gh-release@v1
with:
name: ${{ steps.version.outputs.new_version }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
echo $IMAGE > image-details/image.json
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: image-details
path: image-details/

0 comments on commit bfbffd6

Please sign in to comment.