Skip to content

Commit

Permalink
AJ-1428: update various actions to latest (#407)
Browse files Browse the repository at this point in the history
update various actions to latest
  • Loading branch information
davidangb authored Nov 13, 2023
1 parent d9d9099 commit 0def2c7
Show file tree
Hide file tree
Showing 9 changed files with 86 additions and 86 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-and-integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
Expand All @@ -37,8 +37,8 @@ jobs:
ports: [ "5432:5432" ]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install pg_dump
run: sudo apt install postgresql-14 postgresql-contrib

Expand All @@ -48,7 +48,7 @@ jobs:
run: psql -h 127.0.0.1 -U postgres -f ./local-dev/local-postgres-init.sql

- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
Expand All @@ -67,7 +67,7 @@ jobs:

- name: Upload Test Reports
if: always()
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v3
with:
name: Test Reports
path: service/build/reports
10 changes: 5 additions & 5 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
Expand All @@ -39,7 +39,7 @@ jobs:
ports: [ "5432:5432" ]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# Needed by sonar to get the git history for the branch the PR will be merged into.
with:
fetch-depth: 0
Expand All @@ -50,7 +50,7 @@ jobs:
run: psql -h 127.0.0.1 -U postgres -f ./local-dev/local-postgres-init.sql

- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:

- name: Upload Test Reports
if: always()
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v3
with:
name: Test Reports
path: service/build/reports
12 changes: 6 additions & 6 deletions .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
id-token: 'write'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
Expand All @@ -43,7 +43,7 @@ jobs:
JIRA_ID=$(echo "${{ inputs.jiraId }}" | grep -iEo -m 1 'AJ-[0-9]+' | head -1 || '')
if [[ -z "$JIRA_ID" ]]; then
echo "JIRA_ID=missing" >> $GITHUB_OUTPUT
else
else
echo "JIRA_ID=${JIRA_ID}" >> $GITHUB_OUTPUT
fi
set -e
Expand All @@ -68,13 +68,13 @@ jobs:
- name: Explicitly auth Docker for GCR
run: gcloud auth configure-docker --quiet

- name: Build WDS base Docker image
- name: Build WDS base Docker image
run: docker build -f Dockerfile --no-cache -t wdsbase:snapshot .

- name: Tag WDS base Docker image
- name: Tag WDS base Docker image
run: docker tag wdsbase:snapshot us.gcr.io/broad-dsp-gcr-public/debian/wds-debian-pg-dump:latest

- name: Push WDS base Docker image
- name: Push WDS base Docker image
run: docker push us.gcr.io/broad-dsp-gcr-public/debian/wds-debian-pg-dump:latest

- name: Construct GCR docker image name
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
docker push --all-tags ${{ steps.acr-image-name.outputs.name }}
- name: Clone terra-helmfile
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: broadinstitute/terra-helmfile
token: ${{ secrets.BROADBOT_TOKEN }} # Has to be set at checkout AND later when pushing to work
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-java-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
jakarta: [ true, false ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
Expand All @@ -27,7 +27,7 @@ jobs:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle

- name: Build all projects without running tests
run: ./gradlew --build-cache build -x test

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-pacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
repo-version: ${{ steps.extract-branch.outputs.repo-version }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Extract branch
id: extract-branch
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
- name: Checkout current code
uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
Expand Down
60 changes: 30 additions & 30 deletions .github/workflows/release-python-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
build-n-publish:
name: Build, test and publish Python client to PyPI
runs-on: ubuntu-latest

services:
postgres:
image: postgres:14
Expand All @@ -26,10 +26,10 @@ jobs:
--health-timeout 5s
--health-retries 5
ports: [ "5432:5432" ]

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -39,7 +39,7 @@ jobs:
python-version: 3.8

- name: Use Node.js ${{matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 18

Expand All @@ -62,56 +62,56 @@ jobs:
working-directory: ./wds-client
run: |
pip install .
- name: Initialize Postgres DB
env:
PGPASSWORD: postgres
run: psql -h 127.0.0.1 -U postgres -f ./local-dev/local-postgres-init.sql

- name: Mock Sam via command-line docker run
run: |
docker run -v ${{ github.workspace }}/service/src/test/resources/nginx.conf:/etc/nginx/nginx.conf:ro -p 9889:80 -d nginx:1.23.3
docker run -v ${{ github.workspace }}/service/src/test/resources/nginx.conf:/etc/nginx/nginx.conf:ro -p 9889:80 -d nginx:1.23.3
- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: 'gradle'

- name: Run WDS service and tests
run: |
export SAM_URL=http://localhost:9889
export DATA_REPO_URL=http://localhost:9889
export WORKSPACE_MANAGER_URL=http://localhost:9889
export WORKSPACE_ID=123e4567-e89b-12d3-a456-426614174000
./gradlew --build-cache build -x test
./gradlew bootRun &
count=20
until $(curl --output /dev/null --silent --head --fail http://localhost:8080/status); do
printf '.'
sleep 1
count=$(expr $count - 1)
if [ "$count" -eq "0" ]; then
echo "WDS is not responding, exit action."
exit
fi
done
pip install pytest
pytest service/src/test/python/test.py
export SAM_URL=http://localhost:9889
export DATA_REPO_URL=http://localhost:9889
export WORKSPACE_MANAGER_URL=http://localhost:9889
export WORKSPACE_ID=123e4567-e89b-12d3-a456-426614174000
./gradlew --build-cache build -x test
./gradlew bootRun &
count=20
until $(curl --output /dev/null --silent --head --fail http://localhost:8080/status); do
printf '.'
sleep 1
count=$(expr $count - 1)
if [ "$count" -eq "0" ]; then
echo "WDS is not responding, exit action."
exit
fi
done
pip install pytest
pytest service/src/test/python/test.py
- name: Install pypa/build
if: ${{ github.ref_name == 'main' }}
working-directory: ./wds-client
run: >-
python -m pip install build --user
- name: Build a binary wheel and a source tarball
if: ${{ github.ref_name == 'main' }}
working-directory: ./wds-client
run: >-
python -m build --sdist --wheel --outdir dist/ .
- name: Publish distribution to PyPI
if: ${{ github.ref_name == 'main' }}
uses: broadinstitute/gh-action-pypi-publish@master
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/run-e2e-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
project-name: '${{ steps.gen.outputs.project_name }}'
bee-name: '${{ env.BEE_NAME }}'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Generate a random billing project name
id: gen
run: |
Expand All @@ -46,15 +46,15 @@ jobs:
ref: refs/heads/main
token: '${{ env.TOKEN }}'
inputs: >-
{
"bee-name": "${{ env.BEE_NAME }}",
{
"bee-name": "${{ env.BEE_NAME }}",
"bee-template-name":
"rawls-e2e-azure-tests",
"version-template": "dev"
"rawls-e2e-azure-tests",
"version-template": "dev"
}
attach-landing-zone-to-bee-workflow:
runs-on: ubuntu-latest
needs: [init-github-context, create-bee-workflow, params-gen]
needs: [ init-github-context, create-bee-workflow, params-gen ]
steps:
- name: dispatch to terra-github-workflows
uses: broadinstitute/workflow-dispatch@v3
Expand All @@ -64,10 +64,10 @@ jobs:
ref: refs/heads/main
token: '${{ env.TOKEN }}'
inputs: >-
{
"bee-name": "${{ env.BEE_NAME }}",
"billing-project": "${{needs.params-gen.outputs.project-name }}",
"service-account": "[email protected]"
{
"bee-name": "${{ env.BEE_NAME }}",
"billing-project": "${{needs.params-gen.outputs.project-name }}",
"service-account": "[email protected]"
}
run-e2e-test-job:
needs:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/submit-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
permissions: # The Dependency Submission API requires write permission
contents: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
Expand All @@ -27,4 +27,4 @@ jobs:
gradle-build-module: |-
:service
:client
Loading

0 comments on commit 0def2c7

Please sign in to comment.