diff --git a/.github/workflows/build-prerelease.yml b/.github/workflows/build-prerelease.yml deleted file mode 100644 index 8ba760d..0000000 --- a/.github/workflows/build-prerelease.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: skaffold-build-prerelease -on: - push: - tags: - - "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+" -jobs: - pipeline: - name: Skaffold Docker build - runs-on: ubuntu-20.04 - steps: - - name: Checkout Repo - id: checkout - uses: actions/checkout@v3 - - name: Harbor Login - id: harbor_login - uses: docker/login-action@v2 - with: - registry: harbor.cyverse.org - username: ${{ secrets.HARBOR_USERNAME }} - password: ${{ secrets.HARBOR_PASSWORD }} - - name: Install Kubernetes Tools - id: install_k8s_tools - uses: yokawasa/action-setup-kube-tools@v0.9.2 - - name: Build Docker images - id: build - run: | - skaffold build --file-output build.json - - name: Build manifest tarball - id: build_manifest_tarball - run: | - tar -czpvf deploy-info.tar.gz build.json skaffold.yaml k8s - - uses: ncipollo/release-action@v1 - with: - artifacts: "build.json,deploy-info.tar.gz" - prerelease: true diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml deleted file mode 100644 index be07f90..0000000 --- a/.github/workflows/build-release.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: skaffold-build-release -on: - push: - tags: - - "v[0-9]+.[0-9]+.[0-9]+" -jobs: - pipeline: - name: Skaffold Docker build - runs-on: ubuntu-20.04 - steps: - - name: Checkout Repo - id: checkout - uses: actions/checkout@v3 - - name: Harbor Login - id: harbor_login - uses: docker/login-action@v2 - with: - registry: harbor.cyverse.org - username: ${{ secrets.HARBOR_USERNAME }} - password: ${{ secrets.HARBOR_PASSWORD }} - - name: Install Kubernetes Tools - id: install_k8s_tools - uses: yokawasa/action-setup-kube-tools@v0.9.2 - - name: Build Docker images - id: build - run: | - skaffold build --file-output build.json - - name: Build manifest tarball - id: build_manifest_tarball - run: | - tar -czpvf deploy-info.tar.gz build.json skaffold.yaml k8s - - uses: ncipollo/release-action@v1 - with: - artifacts: "build.json,deploy-info.tar.gz" diff --git a/.github/workflows/skaffold-build.yml b/.github/workflows/skaffold-build.yml new file mode 100644 index 0000000..2d57c99 --- /dev/null +++ b/.github/workflows/skaffold-build.yml @@ -0,0 +1,16 @@ +name: skaffold-build + +on: + push: + tags: + - "v[0-9]+.[0-9]+.[0-9]+" + - "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+" + +jobs: + call-workflow-passing-data: + uses: cyverse-de/github-workflows/.github/workflows/skaffold-build.yml@v0.0.3 + with: + build-prerelease: ${{ contains(github.ref_name, '-rc') }} + secrets: + harbor-username: ${{ secrets.HARBOR_USERNAME }} + harbor-password: ${{ secrets.HARBOR_PASSWORD }}