From f5d1f9648a2737a83ce55e75970ccb20cb5d6cdc Mon Sep 17 00:00:00 2001 From: bahill Date: Thu, 18 Jan 2024 13:38:35 -0500 Subject: [PATCH] Updating dev action to not run tests, and main name to fix display issue. Testing is not needed in dev as we run this on all PR pushes & syncs. Testing can/should be run locally in dev (takes 90 minutes) --- .github/workflows/build_and_publish_dev.yaml | 46 ++----------------- .github/workflows/build_and_publish_main.yaml | 2 +- 2 files changed, 4 insertions(+), 44 deletions(-) diff --git a/.github/workflows/build_and_publish_dev.yaml b/.github/workflows/build_and_publish_dev.yaml index c7968311..2cb13aa2 100644 --- a/.github/workflows/build_and_publish_dev.yaml +++ b/.github/workflows/build_and_publish_dev.yaml @@ -9,48 +9,6 @@ jobs: - uses: actions/checkout@v2 - name: Fetch tag history run: git fetch --tags - - uses: google-github-actions/setup-gcloud@v0.2.1 - name: Setup gcloud for Dataflow tests - with: - project_id: ${{ secrets.DEV_PROJECT_ID }} - service_account_key: ${{ secrets.GCP_TEST_KEY }} - export_default_credentials: true - - name: Set up Python 3.9 for dataflow tests - uses: actions/setup-python@v2 - with: - python-version: 3.9.16 - - name: Install Poetry - uses: snok/install-poetry@v1.2 - with: - version: 1.1.9 - - name: Restore cache dependencies - uses: actions/cache@v2 - env: - cache-name: cache-poetry-v2 - with: - path: ~/.cache/pypoetry - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./orchestration/pyproject.toml') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - - name: Install dependencies - run: poetry install - working-directory: ${{ github.workspace }}/orchestration - - uses: olafurpg/setup-scala@v10 - with: - java-version: graalvm@20.0.0 - - name: Check Scala formatting - run: sbt scalafmtCheckAll - - name: Scala Compile - run: sbt Compile/compile Test/compile IntegrationTest/compile - - name: Scala Test - run: sbt "set ThisBuild/coverageEnabled := true" test IntegrationTest/test coverageAggregate - - name: Run pytest E2E test suite - run: poetry run pytest -v -m e2e - working-directory: ${{ github.workspace }}/orchestration - - name: Publish Scala coverage - uses: codecov/codecov-action@v1 - uses: google-github-actions/setup-gcloud@v0.2.1 name: Setup gcloud for pushing Docker images with: @@ -59,6 +17,9 @@ jobs: export_default_credentials: true - name: Setup GCR auth run: gcloud auth configure-docker --quiet us.gcr.io,us-east4-docker.pkg.dev + - uses: olafurpg/setup-scala@v10 + with: + java-version: graalvm@20.0.0 - name: Push Scala Dataflow Docker image run: sbt publish - name: Get artifact slug @@ -76,4 +37,3 @@ jobs: context: . push: true tags: us-east4-docker.pkg.dev/broad-dsp-monster-hca-dev/monster-dev-env/hca_ingest_compose_dev_env:${{steps.get-artifact-slug.outputs.slug}}, us-east4-docker.pkg.dev/broad-dsp-monster-hca-dev/monster-dev-env/hca_ingest_compose_dev_env:dev - diff --git a/.github/workflows/build_and_publish_main.yaml b/.github/workflows/build_and_publish_main.yaml index 109ef801..74f11c9f 100644 --- a/.github/workflows/build_and_publish_main.yaml +++ b/.github/workflows/build_and_publish_main.yaml @@ -1,4 +1,4 @@ -name: Main Validation and Release +name: Main Validation and Release Workflow on: pull_request_target: types: