Skip to content

Commit

Permalink
Merge pull request #29 from microsoft/main
Browse files Browse the repository at this point in the history
Rebase with the latest changes from the Microsoft deployment
  • Loading branch information
PABenedictEvans authored Apr 9, 2024
2 parents aa53471 + ea63ebf commit 37bea52
Show file tree
Hide file tree
Showing 36 changed files with 337 additions and 160 deletions.
2 changes: 1 addition & 1 deletion .github/actions/devcontainer_run_command/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ runs:
echo "AZURE_ENVIRONMENT=$azure_env" >> $GITHUB_ENV
- name: Azure Login
uses: azure/login@v1
uses: azure/login@v2
if: contains(inputs.COMMAND, 'bootstrap') != true
with:
creds: ${{ inputs.AZURE_CREDENTIALS }}
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/build_docker_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ jobs:
steps:
- name: Upload Event File
# this step is required to publish test results from forks
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Event File
path: ${{ github.event_path }}

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Filter changes
uses: dorny/paths-filter@v2
uses: dorny/paths-filter@v3
id: filter
with:
filters: |
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:

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

# 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 @@ -105,7 +105,7 @@ jobs:
if: |
(steps.filter.outputs.api == 'true'
|| github.event_name == 'workflow_dispatch')
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ./api_app/
file: ./api_app/Dockerfile
Expand All @@ -116,7 +116,7 @@ jobs:

- name: "Check pytest failure file existence"
id: check_api_test_result
uses: andstor/file-existence-action@v2
uses: andstor/file-existence-action@v3
with:
files: "test-results/pytest_api_unit_failed"

Expand All @@ -125,7 +125,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@v4
uses: docker/build-push-action@v5
with:
context: ./api_app/
file: ./api_app/Dockerfile
Expand All @@ -136,7 +136,7 @@ jobs:
if: |
(steps.filter.outputs.resource_processor == 'true'
|| github.event_name == 'workflow_dispatch')
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ./resource_processor
file: ./resource_processor/vmss_porter/Dockerfile
Expand All @@ -147,7 +147,7 @@ jobs:
if: |
(steps.filter.outputs.guacamole_server == 'true'
|| github.event_name == 'workflow_dispatch')
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ./templates/workspace_services/guacamole/guacamole-server
file: ./templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile
Expand All @@ -158,7 +158,7 @@ jobs:

- name: "Check maven failure file existence"
id: check_maven_test_result
uses: andstor/file-existence-action@v2
uses: andstor/file-existence-action@v3
with:
files: "test-results/guacamole_package_failed"

Expand All @@ -167,7 +167,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@v4
uses: docker/build-push-action@v5
with:
context: ./templates/workspace_services/guacamole/guacamole-server
file: ./templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile
Expand All @@ -178,7 +178,7 @@ jobs:
if: |
(steps.filter.outputs.gitea == 'true'
|| github.event_name == 'workflow_dispatch')
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ./templates/shared_services/gitea/docker
file: ./templates/shared_services/gitea/docker/Dockerfile
Expand All @@ -195,7 +195,7 @@ jobs:
if: |
(steps.filter.outputs.airlock_processor == 'true'
|| github.event_name == 'workflow_dispatch')
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ./airlock_processor/
file: ./airlock_processor/Dockerfile
Expand All @@ -206,7 +206,7 @@ jobs:

- name: "Check pytest failure file existence"
id: check_airlock_processor_test_result
uses: andstor/file-existence-action@v2
uses: andstor/file-existence-action@v3
with:
files: "test-results/pytest_airlock_processor_unit_failed"

Expand All @@ -215,7 +215,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@v4
uses: docker/build-push-action@v5
with:
context: ./airlock_processor/
file: ./airlock_processor/Dockerfile
Expand All @@ -224,7 +224,7 @@ jobs:

- name: Upload Unit Test Results
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-results
path: test-results
10 changes: 6 additions & 4 deletions .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,30 @@ on:
types: [published]
push:
paths:
- 'docs/**'
- "docs/**"
- mkdocs.yml
branches:
- main
jobs:
deploy:
name: Deploy Documentation
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Checkout main
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
persist-credentials: true
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x
- name: Install Dependencies
run: |
pip install -r docs/requirements.txt
- name: Configure Git User
# Required by mike for the commit it does to the gh-pages branch
# Required by mike for the commit it does to the gh-pages branch
run: |
git config user.name "ci-docs"
git config user.email "[email protected]"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_validation_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# Full git history is needed to get a proper list of
# changed files within `super-linter`
fetch-depth: 0
persist-credentials: false

- uses: dorny/paths-filter@v2
- uses: dorny/paths-filter@v3
id: filter
with:
filters: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clean_validation_envs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
environment: CICD
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# This is CRITICAL since we're making decisions based on branch existence
fetch-depth: 0
persist-credentials: false

- name: Azure Login
uses: azure/login@v1
uses: azure/login@v2
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}
environment: ${{ (secrets.AZURE_ENVIRONMENT != '' && secrets.AZURE_ENVIRONMENT) || 'AzureCloud' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cli-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout (GitHub)
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build and run dev container task
uses: ./.github/actions/devcontainer_run_command
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
AZURE_ENVIRONMENT: ${{ secrets.AZURE_ENVIRONMENT }}

- name: Upload Wheel as artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: tre-cli
path: dist/tre-*.whl
Loading

0 comments on commit 37bea52

Please sign in to comment.