Skip to content

Commit

Permalink
On branch cis Use microsoft java. Comment wording.
Browse files Browse the repository at this point in the history
modified:   .github/workflows/twas-base-cisBuild.yml
modified:   .github/workflows/twas-nd-cisBuild.yml

Signed-off-by: Ed Burns <[email protected]>
  • Loading branch information
edburns committed Jan 19, 2023
1 parent 5e5bb70 commit d087478
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
1 change: 0 additions & 1 deletion .github/workflows/twas-base-cisBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ env:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/twas-nd-cisBuild.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# This is a basic workflow to help you get started with Actions

name: twas-nd-cis CICD

# Controls when the action will run.
Expand Down Expand Up @@ -41,7 +39,6 @@ env:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest
Expand All @@ -58,7 +55,7 @@ jobs:
- name: Set up JDK 8
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'microsoft'
java-version: '8'
- name: Checkout azure-javaee-iaas
uses: actions/checkout@v3
Expand Down Expand Up @@ -256,7 +253,7 @@ jobs:
az snapshot revoke-access --ids \
$(az snapshot show -g ${{ env.testResourceGroup }} -n ${{ env.osDiskSnapshotName }} --query id -o tsv) \
$(az snapshot show -g ${{ env.testResourceGroup }} -n ${{ env.dataDiskSnapshotName }} --query id -o tsv)
- name: Clean up resources but vhd storage account
- name: Clean up all resources except for vhd storage account
uses: azure/CLI@v1
with:
azcliversion: ${{ env.azCliVersion }}
Expand Down

0 comments on commit d087478

Please sign in to comment.