Skip to content

Commit

Permalink
Upgrade GitHub Actions (#2744)
Browse files Browse the repository at this point in the history
* Upgrade github actions

* update super linter

* update changelog

* remove set-output

* lint
  • Loading branch information
tamirkamara authored Oct 19, 2022
1 parent a886848 commit 72b15b1
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 36 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/build_docker_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
- name: Upload Event File
# this step is required to publish test results from forks
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Event File
path: ${{ github.event_path }}
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

# Unit Tests are executed by calling the 'test-results' target in the
# Dockerfile's. Test runner exit codes must be swallowed (and kept) so we
Expand All @@ -94,7 +94,7 @@ jobs:
if: |
(steps.filter.outputs.api == 'true'
|| github.event_name == 'workflow_dispatch')
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: ./api_app/
file: ./api_app/Dockerfile
Expand All @@ -114,7 +114,7 @@ jobs:
(steps.filter.outputs.api == 'true'
|| github.event_name == 'workflow_dispatch')
&& steps.check_api_test_result.outputs.files_exists == 'false'
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: ./api_app/
file: ./api_app/Dockerfile
Expand All @@ -125,7 +125,7 @@ jobs:
if: |
(steps.filter.outputs.resource_processor == 'true'
|| github.event_name == 'workflow_dispatch')
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: ./resource_processor
file: ./resource_processor/vmss_porter/Dockerfile
Expand All @@ -136,7 +136,7 @@ jobs:
if: |
(steps.filter.outputs.guacamole_server == 'true'
|| github.event_name == 'workflow_dispatch')
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: ./templates/workspace_services/guacamole/guacamole-server
file: ./templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile
Expand All @@ -156,7 +156,7 @@ jobs:
(steps.filter.outputs.guacamole_server == 'true'
|| github.event_name == 'workflow_dispatch')
&& steps.check_maven_test_result.outputs.files_exists == 'false'
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: ./templates/workspace_services/guacamole/guacamole-server
file: ./templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile
Expand All @@ -167,7 +167,7 @@ jobs:
if: |
(steps.filter.outputs.gitea == 'true'
|| github.event_name == 'workflow_dispatch')
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: ./templates/shared_services/gitea/docker
file: ./templates/shared_services/gitea/docker/Dockerfile
Expand All @@ -184,7 +184,7 @@ jobs:
if: |
(steps.filter.outputs.airlock_processor == 'true'
|| github.event_name == 'workflow_dispatch')
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: ./airlock_processor/
file: ./airlock_processor/Dockerfile
Expand All @@ -204,7 +204,7 @@ jobs:
(steps.filter.outputs.airlock_processor == 'true'
|| github.event_name == 'workflow_dispatch')
&& steps.check_airlock_processor_test_result.outputs.files_exists == 'false'
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: ./airlock_processor/
file: ./airlock_processor/Dockerfile
Expand All @@ -213,7 +213,7 @@ jobs:

- name: Upload Unit Test Results
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: test-results
path: test-results
2 changes: 1 addition & 1 deletion .github/workflows/build_validation_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
# the slim image is 2GB smaller and we don't use the extra stuff
# Moved this after the Terraform checks above due something similar to this issue:
# https://github.com/github/super-linter/issues/2433
uses: github/super-linter/slim@v4.9.5
uses: github/super-linter/slim@v4.9.7
env:
VALIDATE_ALL_CODEBASE: false
DEFAULT_BRANCH: main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_tre_branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
echo "github ref: ${GITHUB_REF}"
REFID=$(echo "${GITHUB_REF}" | shasum | cut -c1-8)
echo "using id of: ${REFID} for GitHub Ref: ${GITHUB_REF}"
echo "::set-output name=refid::${REFID}"
echo "refid=${REFID}" >> "$GITHUB_OUTPUT"
run-deploy-tre-not-main:
name: "Deploy PR"
Expand Down
35 changes: 17 additions & 18 deletions .github/workflows/deploy_tre_reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
- name: Report check status start
if: inputs.prHeadSha != ''
uses: LouisBrunner/checks-action@v1.1.1
uses: LouisBrunner/checks-action@v1.5.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
sha: ${{ inputs.prHeadSha }}
Expand All @@ -145,7 +145,7 @@ jobs:
ref: ${{ inputs.prRef }}

- name: Set up Docker BuildKit
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

- name: Azure Login
uses: azure/login@v1
Expand Down Expand Up @@ -621,17 +621,11 @@ jobs:

- name: Upload Test Results
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: E2E Test (Smoke) Results
path: "./e2e_tests/pytest_e2e_smoke.xml"

- name: Publish Test Results
if: always()
uses: EnricoMi/publish-unit-test-result-action@v1
with:
files: "./e2e_tests/pytest_e2e_smoke.xml"

e2e_tests_custom:
name: "Run E2E Tests"
if: ${{ inputs.e2eTestsCustomSelector != '' }}
Expand Down Expand Up @@ -669,32 +663,26 @@ jobs:

- name: Upload Test Results
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: E2E Test Results
path: "./e2e_tests/pytest_e2e_custom.xml"

- name: Publish Test Results
if: always()
uses: EnricoMi/publish-unit-test-result-action@v1
with:
files: "./e2e_tests/pytest_e2e_custom.xml"

summary:
name: Summary
needs: [e2e_tests_smoke, e2e_tests_custom]
runs-on: ubuntu-latest
if: always()
environment: ${{ inputs.environmentName }}
steps:
- uses: technote-space/workflow-conclusion-action@v2
- uses: technote-space/workflow-conclusion-action@v3

# For PR builds triggered from comment builds, the GITHUB_REF is set to main
# so the checks aren't automatically associated with the PR
# If prHeadSha is specified then explicity mark the checks for that SHA
- name: Report check status
if: inputs.prHeadSha != ''
uses: LouisBrunner/checks-action@v1.1.1
uses: LouisBrunner/checks-action@v1.5.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
# the name must be identical to the one received by the real job
Expand All @@ -719,3 +707,14 @@ jobs:
notification-summary: "Failed to deploy from main"
notification-color: dc3545
timezone: Europe/Zurich

- name: Download Artifacts
uses: actions/download-artifact@v2
with:
path: artifacts

- name: Publish E2E Test Results
uses: EnricoMi/publish-unit-test-result-action@v2
with:
junit_files: "artifacts/**/*.xml"
check_name: "E2E Test Results"
2 changes: 1 addition & 1 deletion .github/workflows/lets_encrypt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
persist-credentials: false

- name: Install Terraform
uses: hashicorp/setup-terraform@v1
uses: hashicorp/setup-terraform@v2
with:
terraform_version: 1.2.9
terraform_wrapper: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_comment_bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
# and will have to send it "manually"
- name: Bypass E2E check-runs status
if: ${{ steps.check_command.outputs.command == 'test-force-approve' }}
uses: LouisBrunner/checks-action@v1.1.1
uses: LouisBrunner/checks-action@v1.5.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
# the name must be identical to the one received by the real job
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test_results.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,13 @@ jobs:
done
- name: Publish Test Results
uses: EnricoMi/publish-unit-test-result-action@v1
uses: EnricoMi/publish-unit-test-result-action@v2
with:
commit: ${{ github.event.workflow_run.head_sha }}
event_file: artifacts/Event File/event.json
event_name: ${{ github.event.workflow_run.event }}
files: "artifacts/**/*.xml"
check_name: "Unit Test Results"

# The following step is the catch situations where the tests didn't run at all.
- name: Check failure files
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
**BREAKING CHANGES & MIGRATIONS**:

FEATURES:
* Added filtering and sorting to Airlock UI ([#2511](https://github.com/microsoft/AzureTRE/issues/2511))
* Added filtering and sorting to Airlock UI ([#2511](https://github.com/microsoft/AzureTRE/pull/2730))
* Added title field to Airlock requests ([#2731](https://github.com/microsoft/AzureTRE/pull/2731))

ENHANCEMENTS:
* Upgrade Github Actions versions ([#2731](https://github.com/microsoft/AzureTRE/pull/2744))

BUG FIXES:

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ lint:
-e VALIDATE_TYPESCRIPT_ES=true \
-e FILTER_REGEX_INCLUDE=${LINTER_REGEX_INCLUDE} \
-v $${LOCAL_WORKSPACE_FOLDER}:/tmp/lint \
github/super-linter:slim-v4.9.6
github/super-linter:slim-v4.9.7

lint-docs:
LINTER_REGEX_INCLUDE='./docs/.*\|./mkdocs.yml' $(MAKE) lint
Expand Down

0 comments on commit 72b15b1

Please sign in to comment.