Skip to content

Commit

Permalink
fix(infra): fix intendation
Browse files Browse the repository at this point in the history
  • Loading branch information
Björn Urban committed Feb 22, 2024
1 parent dc2987f commit 4f95931
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 68 deletions.
1 change: 1 addition & 0 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
path: |
backend/
frontend/public

build-docker:
needs: build
Expand Down
66 changes: 33 additions & 33 deletions .github/workflows/release-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,41 +58,41 @@ jobs:
backend/
frontend/public
build-docker:
needs: build
runs-on: ubuntu-latest
strategy:
matrix:
goarch: [ 'amd64', 'arm64' ] # Define architectures here
if: ${{ github.ref }} != 'master' && ${{ github.ref }} != 'development'
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Download build artifact
uses: actions/download-artifact@v4
with:
name: production-artifacts-${{matrix.goarch}}
merge-multiple: true
build-docker:
needs: build
runs-on: ubuntu-latest
strategy:
matrix:
goarch: [ 'amd64', 'arm64' ] # Define architectures here
if: ${{ github.ref }} != 'master' && ${{ github.ref }} != 'development'
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Download build artifact
uses: actions/download-artifact@v4
with:
name: production-artifacts-${{matrix.goarch}}
merge-multiple: true

- name: Set up Docker Build
uses: docker/setup-buildx-action@v3
- name: Set up Docker Build
uses: docker/setup-buildx-action@v3

- name: Login to Docker Registry
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v4
with:
context: .
push: true
tags: ${{ secrets.DOCKERHUB_USERNAME }}/kubevoyage:${{ env.BRANCH_NAME }}
platforms: linux/${{ matrix.goarch }}
build-args: |
TARGETARCH=${{ matrix.goarch }}
- name: Login to Docker Registry
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v4
with:
context: .
push: true
tags: ${{ secrets.DOCKERHUB_USERNAME }}/kubevoyage:${{ env.BRANCH_NAME }}
platforms: linux/${{ matrix.goarch }}
build-args: |
TARGETARCH=${{ matrix.goarch }}
helm-release:
needs: build-docker
# depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions
Expand Down
68 changes: 33 additions & 35 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,42 +57,40 @@ jobs:
path: |
backend/
frontend/public
build-docker:
needs: build
runs-on: ubuntu-latest
strategy:
matrix:
goarch: [ 'amd64', 'arm64' ] # Define architectures here
if: ${{ github.ref }} != 'master' && ${{ github.ref }} != 'development'
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Download build artifact
uses: actions/download-artifact@v4
with:
name: production-artifacts-${{matrix.goarch}}
merge-multiple: true
- name: Set up Docker Build
uses: docker/setup-buildx-action@v3

build-docker:
needs: build
runs-on: ubuntu-latest
strategy:
matrix:
goarch: [ 'amd64', 'arm64' ] # Define architectures here
if: ${{ github.ref }} != 'master' && ${{ github.ref }} != 'development'
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Download build artifact
uses: actions/download-artifact@v4
with:
name: production-artifacts-${{matrix.goarch}}
merge-multiple: true
- name: Set up Docker Build
uses: docker/setup-buildx-action@v3

- name: Login to Docker Registry
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v4
with:
context: .
push: true
tags: ${{ secrets.DOCKERHUB_USERNAME }}/kubevoyage:${{ env.BRANCH_NAME }}
platforms: linux/${{ matrix.goarch }}
build-args: |
TARGETARCH=${{ matrix.goarch }}
- name: Login to Docker Registry
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v4
with:
context: .
push: true
tags: ${{ secrets.DOCKERHUB_USERNAME }}/kubevoyage:${{ env.BRANCH_NAME }}
platforms: linux/${{ matrix.goarch }}
build-args: |
TARGETARCH=${{ matrix.goarch }}
helm-release:
needs: build-docker
# depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions
Expand Down

0 comments on commit 4f95931

Please sign in to comment.