ad arm64 testing (#16876)

This commit is contained in:
John Murret 2023-04-05 09:58:00 -06:00 committed by GitHub
parent 671d5825ca
commit dcb9da2eb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 22 deletions

View File

@ -179,29 +179,37 @@ jobs:
secrets: secrets:
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }} elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
# TODO(JM): - linux arm64 is not available in our self-hosted runners dev-build-arm64:
# they are currently on the roadmap. # only run on enterprise because GHA does not have arm64 runners in OSS
# # create a development build for arm64 if: ${{ endsWith(github.repository, '-enterprise') }}
# dev-build-arm64: needs:
# needs: - setup
# - setup uses: ./.github/workflows/reusable-dev-build.yml
# uses: ./.github/workflows/reusable-dev-build.yml with:
# with: uploaded-binary-name: 'consul-bin-arm64'
# uploaded-binary-name: 'consul-bin-arm64' runs-on: ${{ needs.setup.outputs.compute-xl }}
# # runs-on: ${{ needs.setup.outputs.compute-xl-arm64 }} go-arch: "arm64"
repository-name: ${{ github.repository }}
secrets:
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
# go-test-arm64: go-test-arm64:
# # TODO(JM): Fix to run on arm64 # only run on enterprise because GHA does not have arm64 runners in OSS
# needs: if: ${{ endsWith(github.repository, '-enterprise') }}
# - setup needs:
# - dev-build-arm64 - setup
# uses: ./.github/workflows/reusable-unit-split.yml - dev-build-arm64
# with: uses: ./.github/workflows/reusable-unit-split.yml
# directory: . with:
# uploaded-binary-name: 'consul-bin-arm64' directory: .
# runner-count: 12 uploaded-binary-name: 'consul-bin-arm64'
# # runs-on: ${{ needs.setup.outputs.compute-xl-arm64 }} runner-count: 12
# go-test-flags: 'if ! [[ "$GITHUB_REF_NAME" =~ ^main$|^release/ ]]; then export GO_TEST_FLAGS="-short"; fi' runs-on: "['self-hosted', 'ondemand', 'os=macos-arm', 'arm64']"
go-test-flags: 'if ! [[ "$GITHUB_REF_NAME" =~ ^main$|^release/ ]]; then export GO_TEST_FLAGS="-short"; fi'
repository-name: ${{ github.repository }}
secrets:
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
consul-license: ${{secrets.CONSUL_LICENSE}}
go-test: go-test:
needs: needs:

View File

@ -14,6 +14,10 @@ on:
repository-name: repository-name:
required: true required: true
type: string type: string
go-arch:
required: false
type: string
default: ""
secrets: secrets:
elevated-github-token: elevated-github-token:
required: true required: true
@ -30,6 +34,8 @@ jobs:
with: with:
go-version-file: 'go.mod' go-version-file: 'go.mod'
- name: Build - name: Build
env:
GOARCH: ${{ inputs.goarch }}
run: make dev run: make dev
# save dev build to pass to downstream jobs # save dev build to pass to downstream jobs
- uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # pin@v3.1.2 - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # pin@v3.1.2