forked from armadaproject/armada
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into rich/docker-package-note
- Loading branch information
Showing
11 changed files
with
70 additions
and
143 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,12 +6,12 @@ on: | |
jobs: | ||
run-python-tests: | ||
runs-on: ubuntu-22.04 | ||
strategy: | ||
matrix: | ||
go: [ '1.20' ] | ||
steps: | ||
- uses: actions/[email protected] | ||
- uses: ./.github/workflows/go-setup | ||
- name: Setup Go | ||
uses: ./.github/actions/setup-go-cache | ||
with: | ||
cache-prefix: run-python-tests | ||
- name: Install Protoc | ||
uses: arduino/setup-protoc@v2 | ||
with: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,7 +46,6 @@ jobs: | |
runs-on: ubuntu-22.04 | ||
strategy: | ||
matrix: | ||
go: [ '1.20' ] | ||
python: [ '3.8', '3.9', '3.10' ] | ||
include: | ||
- tox-env: 'py38' | ||
|
@@ -56,7 +55,10 @@ jobs: | |
python: '3.10' | ||
steps: | ||
- uses: actions/[email protected] | ||
- uses: ./.github/workflows/go-setup | ||
- name: Setup Go | ||
uses: ./.github/actions/setup-go-cache | ||
with: | ||
cache-prefix: airflow-tox | ||
- name: Install Protoc | ||
uses: arduino/setup-protoc@v2 | ||
with: | ||
|
@@ -71,14 +73,6 @@ jobs: | |
github-token: ${{secrets.GITHUB_TOKEN}} | ||
airflow-integration-tests: | ||
if: github.repository_owner == 'armadaproject' | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
# WARN(JayF): If we begin attempting to support >1 golang version, | ||
# we'll have to ensure that we don't use the same artifact name for | ||
# both versions in the matrix -- this will lead to them overwriting | ||
# each other. | ||
go: [ '1.20' ] | ||
# As of December 2022, using 8vcpu runners is slower overall, | ||
# due to longer queue times. | ||
runs-on: ubuntu-22.04 | ||
|
@@ -92,21 +86,12 @@ jobs: | |
- uses: actions/[email protected] | ||
- run: docker buildx create --name ${DOCKER_BUILDX_BUILDER} --driver docker-container --use | ||
- run: docker buildx install | ||
- uses: actions/setup-go@v4 | ||
id: setup-go | ||
with: | ||
go-version: ${{ matrix.go }} | ||
|
||
- name: Compute tools cache info | ||
id: tools-cache-info | ||
run: echo path=$(go env GOPATH)/bin >> $GITHUB_OUTPUT | ||
|
||
- name: Setup tools cache | ||
uses: actions/cache@v3 | ||
id: tools-cache | ||
- name: Setup Go | ||
uses: ./.github/actions/setup-go-cache | ||
with: | ||
path: ${{ steps.tools-cache-info.outputs.path }} | ||
key: tools-go-${{ steps.setup-go.outputs.go-version }}-tools-${{ hashFiles('tools.yaml') }} | ||
cache-prefix: airflow-integration-tests | ||
cache-tools: true | ||
|
||
- name: Setup and run integration tests | ||
run: | | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,7 +32,6 @@ jobs: | |
fail-fast: false | ||
matrix: | ||
language: [ 'csharp', 'go', 'javascript' ] | ||
go: [ '1.20' ] | ||
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] | ||
# Learn more: | ||
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed | ||
|
@@ -47,19 +46,11 @@ jobs: | |
version: '23.3' | ||
repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
- uses: ./.github/workflows/go-setup | ||
id: setup-go | ||
|
||
- name: Compute tools cache info | ||
id: tools-cache-info | ||
run: echo path=$(go env GOPATH)/bin >> $GITHUB_OUTPUT | ||
|
||
- name: Setup tools cache | ||
uses: actions/cache@v3 | ||
id: tools-cache | ||
- name: Setup Go | ||
uses: ./.github/actions/setup-go-cache | ||
with: | ||
path: ${{ steps.tools-cache-info.outputs.path }} | ||
key: tools-go-${{ steps.setup-go.outputs.go-version }}-tools-${{ hashFiles('tools.yaml') }} | ||
cache-prefix: analyze | ||
cache-tools: true | ||
|
||
- name: Mage Proto | ||
run: go run github.com/magefile/[email protected] -v proto | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -53,11 +53,10 @@ jobs: | |
- name: Checkout | ||
uses: actions/[email protected] | ||
|
||
- name: Set up Go (no caching) | ||
uses: actions/setup-go@v4 | ||
- name: Setup Go | ||
uses: ./.github/actions/setup-go-cache | ||
with: | ||
go-version: '1.20' | ||
cache: false | ||
cache-prefix: go-lint | ||
|
||
- name: Lint using golangci-lint | ||
uses: golangci/golangci-lint-action@v3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,12 +6,12 @@ on: | |
jobs: | ||
run-python-tests: | ||
runs-on: ubuntu-22.04 | ||
strategy: | ||
matrix: | ||
go: [ '1.20' ] | ||
steps: | ||
- uses: actions/[email protected] | ||
- uses: ./.github/workflows/go-setup | ||
- name: Setup Go | ||
uses: ./.github/actions/setup-go-cache | ||
with: | ||
cache-prefix: run-python-tests | ||
- name: Install Protoc | ||
uses: arduino/setup-protoc@v2 | ||
with: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,7 +34,6 @@ jobs: | |
runs-on: ubuntu-22.04 | ||
strategy: | ||
matrix: | ||
go: [ '1.20' ] | ||
python: [ '3.8', '3.9', '3.10' ] | ||
include: | ||
- tox-env: 'py38' | ||
|
@@ -44,7 +43,10 @@ jobs: | |
python: '3.10' | ||
steps: | ||
- uses: actions/[email protected] | ||
- uses: ./.github/workflows/go-setup | ||
- name: Setup Go | ||
uses: ./.github/actions/setup-go-cache | ||
with: | ||
cache-prefix: python-client-tox | ||
- uses: ./.github/workflows/python-tests | ||
with: | ||
python-version: ${{ matrix.python }} | ||
|
@@ -54,14 +56,6 @@ jobs: | |
|
||
python-client-integration-tests: | ||
if: github.repository_owner == 'armadaproject' | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
# WARN(JayF): If we begin attempting to support >1 golang version, | ||
# we'll have to ensure that we don't use the same artifact name for | ||
# both versions in the matrix -- this will lead to them overwriting | ||
# each other. | ||
go: [ '1.20' ] | ||
# As of December 2022, using 8vcpu runners is slower overall, | ||
# due to longer queue times. | ||
runs-on: ubuntu-22.04 | ||
|
@@ -75,21 +69,12 @@ jobs: | |
- uses: actions/[email protected] | ||
- run: docker buildx create --name ${DOCKER_BUILDX_BUILDER} --driver docker-container --use | ||
- run: docker buildx install | ||
- uses: actions/setup-go@v4 | ||
id: setup-go | ||
with: | ||
go-version: ${{ matrix.go }} | ||
|
||
- name: Compute tools cache info | ||
id: tools-cache-info | ||
run: echo path=$(go env GOPATH)/bin >> $GITHUB_OUTPUT | ||
|
||
- name: Setup tools cache | ||
uses: actions/cache@v3 | ||
id: tools-cache | ||
- name: Setup Go | ||
uses: ./.github/actions/setup-go-cache | ||
with: | ||
path: ${{ steps.tools-cache-info.outputs.path }} | ||
key: tools-go-${{ steps.setup-go.outputs.go-version }}-tools-${{ hashFiles('tools.yaml') }} | ||
cache-prefix: python-client-integration-tests | ||
cache-tools: true | ||
|
||
- name: Setup and run integration tests | ||
run: | | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,7 +56,6 @@ jobs: | |
uses: actions/[email protected] | ||
|
||
- name: Setup Go | ||
id: setup-go | ||
uses: ./.github/actions/setup-go-cache | ||
with: | ||
cache-prefix: go-unit-tests | ||
|
@@ -111,21 +110,10 @@ jobs: | |
run: docker image prune -af | ||
|
||
- name: Setup Go | ||
id: setup-go | ||
uses: ./.github/actions/setup-go-cache | ||
with: | ||
cache-prefix: go-integration-tests | ||
|
||
- name: Compute tools cache info | ||
id: tools-cache-info | ||
run: echo path=$(go env GOPATH)/bin >> $GITHUB_OUTPUT | ||
|
||
- name: Setup tools cache | ||
uses: actions/cache@v3 | ||
id: tools-cache | ||
with: | ||
path: ${{ steps.tools-cache-info.outputs.path }} | ||
key: tools-go-${{ steps.setup-go.outputs.go-version }}-make-${{ hashFiles('tools.yaml') }} | ||
cache-tools: true | ||
|
||
- name: Setup Integration Tests | ||
run: go run github.com/magefile/[email protected] -v localdev minimal-pulsar | ||
|
@@ -174,11 +162,10 @@ jobs: | |
- name: Checkout code | ||
uses: actions/[email protected] | ||
|
||
- name: Set up Go (no caching) | ||
uses: actions/setup-go@v4 | ||
- name: Setup Go | ||
uses: ./.github/actions/setup-go-cache | ||
with: | ||
go-version: '1.20' | ||
cache: false | ||
cache-prefix: go-mod-up-to-date | ||
|
||
- name: Download all Go modules | ||
run: go mod download | ||
|
@@ -220,23 +207,11 @@ jobs: | |
version: '23.3' | ||
repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
- name: Set up Go (no caching) | ||
uses: actions/setup-go@v4 | ||
id: setup-go | ||
with: | ||
go-version: ${{ matrix.go }} | ||
cache: false | ||
|
||
- name: Compute tools cache info | ||
id: tools-cache-info | ||
run: echo path=$(go env GOPATH)/bin >> $GITHUB_OUTPUT | ||
|
||
- name: Setup tools cache | ||
uses: actions/cache@v3 | ||
id: tools-cache | ||
- name: Setup Go | ||
uses: ./.github/actions/setup-go-cache | ||
with: | ||
path: ${{ steps.tools-cache-info.outputs.path }} | ||
key: tools-go-${{ steps.setup-go.outputs.go-version }}-make-${{ hashFiles('tools.yaml') }} | ||
cache-prefix: proto-up-to-date | ||
cache-tools: true | ||
|
||
# TODO(JayF): Consider moving this into its own job, that runs under a larger set of circumstances | ||
# since it's possible for this to fail without any go changes being made. | ||
|