Skip to content

Commit

Permalink
Merge pull request #741 from SparebankenVest/fix-workflow-indent
Browse files Browse the repository at this point in the history
Fixed indentation in build workflows
  • Loading branch information
andreasthuen authored Sep 11, 2024
2 parents f766f79 + ee4acc4 commit 20f0f3a
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 35 deletions.
29 changes: 15 additions & 14 deletions .github/workflows/controller-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,24 @@ jobs:
build-deploy:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Checkout
uses: actions/checkout@v3

- name: Setup Golang
uses: actions/setup-go@v3
with:
go-version: '1.21.3'

- name: Build
uses: ./.github/actions/build
env:
AKV2K8S_CLIENT_ID: ${{ secrets.INT_TEST_CLIENT_ID }}
AKV2K8S_CLIENT_SECRET: ${{ secrets.INT_TEST_CLIENT_SECRET }}
AKV2K8S_CLIENT_TENANT_ID: ${{ secrets.INT_TEST_TENANT_ID }}
AKV2K8S_AZURE_SUBSCRIPTION: ${{ secrets.INT_TEST_SUBSCRIPTION }}
with:
build-make-action: image-controller
docker-user: ${{ secrets.PRIVATE_REGISTRY_USERNAME }}
docker-passw: ${{ secrets.PRIVATE_REGISTRY_PASSWORD }}
docker-url: ${{ secrets.PRIVATE_REGISTRY_URL }}
docker-reg: ${{ secrets.PRIVATE_REGISTRY }}
- name: Build
uses: ./.github/actions/build
env:
AKV2K8S_CLIENT_ID: ${{ secrets.INT_TEST_CLIENT_ID }}
AKV2K8S_CLIENT_SECRET: ${{ secrets.INT_TEST_CLIENT_SECRET }}
AKV2K8S_CLIENT_TENANT_ID: ${{ secrets.INT_TEST_TENANT_ID }}
AKV2K8S_AZURE_SUBSCRIPTION: ${{ secrets.INT_TEST_SUBSCRIPTION }}
with:
build-make-action: image-controller
docker-user: ${{ secrets.PRIVATE_REGISTRY_USERNAME }}
docker-passw: ${{ secrets.PRIVATE_REGISTRY_PASSWORD }}
docker-url: ${{ secrets.PRIVATE_REGISTRY_URL }}
docker-reg: ${{ secrets.PRIVATE_REGISTRY }}
13 changes: 7 additions & 6 deletions .github/workflows/vaultenv-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ jobs:
build-deploy:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3

- name: Setup Golang
uses: actions/setup-go@v3
with:
go-version: '1.21.3'
- name: Checkout
uses: actions/checkout@v3

- name: Setup Golang
uses: actions/setup-go@v3
with:
go-version: '1.21.3'

- name: Build
uses: ./.github/actions/build
Expand Down
31 changes: 16 additions & 15 deletions .github/workflows/webhook-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,24 @@ jobs:
build-deploy:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Checkout
uses: actions/checkout@v3

- name: Setup Golang
uses: actions/setup-go@v3
with:
go-version: '1.21.3'

- name: Build
uses: ./.github/actions/build
env:
AKV2K8S_CLIENT_ID: ${{ secrets.INT_TEST_CLIENT_ID }}
AKV2K8S_CLIENT_SECRET: ${{ secrets.INT_TEST_CLIENT_SECRET }}
AKV2K8S_CLIENT_TENANT_ID: ${{ secrets.INT_TEST_TENANT_ID }}
AKV2K8S_AZURE_SUBSCRIPTION: ${{ secrets.INT_TEST_SUBSCRIPTION }}
with:
build-make-action: image-webhook
docker-user: ${{ secrets.PRIVATE_REGISTRY_USERNAME }}
docker-passw: ${{ secrets.PRIVATE_REGISTRY_PASSWORD }}
docker-url: ${{ secrets.PRIVATE_REGISTRY_URL }}
docker-reg: ${{ secrets.PRIVATE_REGISTRY }}
- name: Build
uses: ./.github/actions/build
env:
AKV2K8S_CLIENT_ID: ${{ secrets.INT_TEST_CLIENT_ID }}
AKV2K8S_CLIENT_SECRET: ${{ secrets.INT_TEST_CLIENT_SECRET }}
AKV2K8S_CLIENT_TENANT_ID: ${{ secrets.INT_TEST_TENANT_ID }}
AKV2K8S_AZURE_SUBSCRIPTION: ${{ secrets.INT_TEST_SUBSCRIPTION }}
with:
build-make-action: image-webhook
docker-user: ${{ secrets.PRIVATE_REGISTRY_USERNAME }}
docker-passw: ${{ secrets.PRIVATE_REGISTRY_PASSWORD }}
docker-url: ${{ secrets.PRIVATE_REGISTRY_URL }}
docker-reg: ${{ secrets.PRIVATE_REGISTRY }}

0 comments on commit 20f0f3a

Please sign in to comment.