-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* ci: build s390x * ci: test s390x * ci: dev build s390x * no GOOS * ent only * build: publish s390x * fix syntax error * fix syntax error again * fix syntax error again x2 * test branch * Move s390x conditionals to step level * remove test branch --------- Co-authored-by: emilymianeil <[email protected]>
- Loading branch information
1 parent
d1f5d9b
commit 3b3aa1f
Showing
4 changed files
with
182 additions
and
72 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 |
|---|---|---|
|
|
@@ -57,6 +57,7 @@ jobs: | |
| echo "Product Date: ${{ needs.set-product-version.outputs.product-date }}" | ||
| echo "Prerelease Version: ${{ needs.set-product-version.outputs.pre-version }}" | ||
| echo "Ldflags: ${{ needs.set-product-version.outputs.shared-ldflags }}" | ||
| generate-metadata-file: | ||
| needs: set-product-version | ||
| runs-on: ubuntu-latest | ||
|
|
@@ -173,6 +174,57 @@ jobs: | |
| name: ${{ env.DEB_PACKAGE }} | ||
| path: out/${{ env.DEB_PACKAGE }} | ||
|
|
||
| build-s390x: | ||
| needs: set-product-version | ||
| if: ${{ endsWith(github.repository, '-enterprise') }} | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| include: | ||
| - {go: "1.20.4", goos: "linux", goarch: "s390x"} | ||
| fail-fast: true | ||
|
|
||
| name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build | ||
| steps: | ||
| - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 | ||
|
|
||
| - name: Setup with node and yarn | ||
| uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0 | ||
| with: | ||
| node-version: '14' | ||
| cache: 'yarn' | ||
| cache-dependency-path: 'ui/yarn.lock' | ||
|
|
||
| - name: Build UI | ||
| run: | | ||
| CONSUL_VERSION=${{ needs.set-product-version.outputs.product-version }} | ||
| CONSUL_DATE=${{ needs.set-product-version.outputs.product-date }} | ||
| CONSUL_BINARY_TYPE=${CONSUL_BINARY_TYPE} | ||
| CONSUL_COPYRIGHT_YEAR=$(git show -s --format=%cd --date=format:%Y HEAD) | ||
| echo "consul_version is ${CONSUL_VERSION}" | ||
| echo "consul_date is ${CONSUL_DATE}" | ||
| echo "consul binary type is ${CONSUL_BINARY_TYPE}" | ||
| echo "consul copyright year is ${CONSUL_COPYRIGHT_YEAR}" | ||
| cd ui && make && cd .. | ||
| rm -rf agent/uiserver/dist | ||
| mv ui/packages/consul-ui/dist agent/uiserver/ | ||
| - name: Go Build | ||
| env: | ||
| PRODUCT_VERSION: ${{ needs.set-product-version.outputs.product-version }} | ||
| PRERELEASE_VERSION: ${{ needs.set-product-version.outputs.pre-version }} | ||
| CGO_ENABLED: "0" | ||
| GOLDFLAGS: "${{needs.set-product-version.outputs.shared-ldflags}}" | ||
| uses: hashicorp/[email protected] | ||
| with: | ||
| product_name: ${{ env.PKG_NAME }} | ||
| product_version: ${{ needs.set-product-version.outputs.product-version }} | ||
| go_version: ${{ matrix.go }} | ||
| os: ${{ matrix.goos }} | ||
| arch: ${{ matrix.goarch }} | ||
| reproducible: report | ||
| instructions: |- | ||
| go build -ldflags="$GOLDFLAGS" -o "$BIN_PATH" -trimpath -buildvcs=false | ||
| build-darwin: | ||
| needs: set-product-version | ||
| runs-on: macos-latest | ||
|
|
@@ -186,7 +238,7 @@ jobs: | |
| name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build | ||
| steps: | ||
| - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 | ||
|
|
||
| - name: Setup with node and yarn | ||
| uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0 | ||
| with: | ||
|
|
@@ -319,7 +371,7 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| arch: ["386", "amd64", "arm", "arm64"] | ||
| arch: ["386", "amd64", "arm", "arm64", "s390x"] | ||
| fail-fast: true | ||
| env: | ||
| version: ${{ needs.set-product-version.outputs.product-version }} | ||
|
|
@@ -328,8 +380,10 @@ jobs: | |
| name: Verify ${{ matrix.arch }} linux binary | ||
| steps: | ||
| - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 | ||
| if: ${{ endsWith(github.repository, '-enterprise') || matrix.arch != 's390x' }} | ||
|
|
||
| - name: Download ${{ matrix.arch }} zip | ||
| if: ${{ endsWith(github.repository, '-enterprise') || matrix.arch != 's390x' }} | ||
| uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 | ||
| with: | ||
| name: ${{ env.zip_name }} | ||
|
|
@@ -342,6 +396,7 @@ jobs: | |
| platforms: arm,arm64 | ||
|
|
||
| - name: Run verification for ${{ matrix.arch }} binary | ||
| if: ${{ endsWith(github.repository, '-enterprise') || matrix.arch != 's390x' }} | ||
| run: .github/scripts/verify_artifact.sh ${{ env.zip_name }} v${{ env.version }} | ||
|
|
||
| verify-darwin: | ||
|
|
||
Oops, something went wrong.