diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4b5098230..75d56b336 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -381,3 +381,17 @@ jobs: secrets: inherit with: ziti-version: ${{ needs.publish.outputs.ZITI_VERSION }} + + call-publish-linux-install-packages: + # always() re-enables evaluating conditionals in forks even if Windows or + # macOS builds were skipped + if: | + always() + && needs.publish.result == 'success' + && github.ref == 'refs/heads/main' + name: Publish Release Linux Install Packages + needs: publish + uses: ./.github/workflows/publish-linux-install-packages.yml + secrets: inherit + with: + ziti-version: ${{ needs.publish.outputs.ZITI_VERSION }} diff --git a/BUILD.md b/BUILD.md index caa3d8ee8..d1c355bcc 100644 --- a/BUILD.md +++ b/BUILD.md @@ -5,4 +5,4 @@ Please refer to [the local development README](./doc/002-local-dev.md) for build ## Crossbuilds -When you push to your repo fork then GitHub Actions will automatically crossbuild for several OSs and CPU architectures. You'll then be able to download the built artifacts from the GitHub UI. The easiest way to crossbuild the Linux exectuables locally is to build and run the crossbuild container. Please refer to [the crossbuild container README](../Dockerfile.linux-build.README) for those steps. For hints on crossbuilding for MacOS and Windows see [the main GitHub Actions workflow](../.github/workflows/main.yml) which defines the steps that are run when you push to GitHub. +When you push to your repo fork then GitHub Actions will automatically crossbuild for several OSs and CPU architectures. You'll then be able to download the built artifacts from the GitHub UI. The easiest way to crossbuild the Linux exectuables locally is to build and run the crossbuild container. Please refer to [the crossbuild container README](./docker-images/cross-build/README.md) for those steps. For hints on crossbuilding for MacOS and Windows see [the main GitHub Actions workflow](../.github/workflows/main.yml) which defines the steps that are run when you push to GitHub. diff --git a/docker-images/cross-build/README.md b/docker-images/cross-build/README.md index 8cb86dacf..4f789cd77 100644 --- a/docker-images/cross-build/README.md +++ b/docker-images/cross-build/README.md @@ -12,9 +12,9 @@ This article supports local development by providing a local containerized metho You only need to build the container image once unless you change the Dockerfile or `./linux-build.sh` (the container's entrypoint). ```bash -# build a container image named "zitibuilder" with the same version of Go that's declared in go.mod +# build a container image named "ziti-go-builder" with the same version of Go that's declared in go.mod docker buildx build \ - --tag=zitibuilder \ + --tag=ziti-go-builder \ --build-arg uid=$UID \ --build-arg gid=$GID \ --build-arg golang_version=$(grep -Po '^go\s+\K\d+\.\d+(\.\d+)?$' go.mod) \ @@ -34,16 +34,16 @@ Executing the following `docker run` command will: # build for all three architectures: amd64 arm arm64 docker run \ --rm \ - --name=zitibuilder \ + --name=ziti-go-builder \ --volume=$PWD:/mnt \ - zitibuilder + ziti-go-builder # build only amd64 docker run \ --rm \ - --name=zitibuilder \ + --name=ziti-go-builder \ --volume=$PWD:/mnt \ - zitibuilder \ + ziti-go-builder \ amd64 ``` @@ -53,7 +53,7 @@ You will find the built artifacts in `./release`. ```bash ❯ docker buildx build \ - --tag=zitibuilder \ + --tag=ziti-go-builder \ --build-arg uid=$UID \ --build-arg gid=$GID \ --build-arg golang_version="$(/bin/grep -Po '^go\s+\K\d+\.\d+(\.\d+)?$' go.mod)" \ @@ -89,9 +89,9 @@ You will find the built artifacts in `./release`. ❯ docker run \ --rm \ - --name=zitibuilder \ + --name=ziti-go-builder \ --volume=$PWD:/mnt \ - zitibuilder + ziti-go-builder Number of parallel builds: 4 --> linux/arm: github.com/openziti/ziti/ziti