Skip to content

Commit

Permalink
chore: remove unnecessary input
Browse files Browse the repository at this point in the history
  • Loading branch information
koenmetsu committed Oct 11, 2023
1 parent a4c8a03 commit a479df4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 57 deletions.
49 changes: 1 addition & 48 deletions .github/workflows/build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ on:
image-name: #acm-api
required: true
type: string
build-project: #AssociationRegistry.Acm.Api/
required: true
type: string
semver:
required: true
type: string
Expand Down Expand Up @@ -72,26 +69,6 @@ jobs:
shell: bash
run: dotnet paket restore

- name: Dotnet restore
shell: bash
run: dotnet restore src/${{ inputs.build-project }} --runtime linux-x64

- name: Set solution info
shell: bash
if: inputs.semver != 'none'
run: CI_BUILD_NUMBER=$SEMVER ./build.sh SetSolutionInfo
env:
BUILD_DOCKER_REGISTRY: ${{ secrets.VBR_BUILD_DOCKER_REGISTRY_TST }}
SEMVER: ${{ inputs.semver }}

# - name: Dotnet build
# shell: bash
# run: dotnet build --no-restore --runtime 'linux-x64' --self-contained -f net6.0 src/${{ inputs.build-project }}
#
# - name: Dotnet publish
# shell: bash
# run: dotnet publish -o dist/${{ inputs.build-project }}/linux --no-build --no-restore --runtime 'linux-x64' --self-contained -f net6.0 src/${{ inputs.build-project }}

- name: Containerize
shell: bash
run: CI_BUILD_NUMBER=$SEMVER ./build.sh ${{ inputs.build-target }}
Expand All @@ -103,7 +80,7 @@ jobs:
shell: bash
run: docker images

- name: Save Api Image
- name: Save Image
if: inputs.semver != 'none'
shell: bash
run: docker image save $BUILD_DOCKER_REGISTRY/association-registry/${{ inputs.image-name }}:$SEMVER -o ~/${{ inputs.image-file}}
Expand All @@ -117,27 +94,3 @@ jobs:
with:
name: ${{ inputs.image-name }}
path: ~/${{ inputs.image-file }}

- name: Shows logs ACM container
if: ${{ failure() }}
shell: bash
run: |
docker logs acm
- name: Shows logs elasticsearch container
if: ${{ failure() }}
shell: bash
run: |
docker logs elasticsearch
- name: Shows logs wiremock container
if: ${{ failure() }}
shell: bash
run: |
docker logs wiremock
- name: Shows logs db container
if: ${{ failure() }}
shell: bash
run: |
docker logs db
21 changes: 12 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ jobs:
build-target: Containerize_AcmApi
image-file: api.tar
image-name: api
build-project: OrganisationRegistry.Api/
semver: ${{ needs.set-release-version.outputs.version }}
secrets: inherit

Expand All @@ -183,7 +182,6 @@ jobs:
build-target: Containerize_AgentschapZorgEnGezondheid
image-file: batch-agentschapzorgengezondheidftpdump.tar
image-name: batch-agentschapzorgengezondheidftpdump
build-project: OrganisationRegistry.AgentschapZorgEnGezondheid.FtpDump/
semver: ${{ needs.set-release-version.outputs.version }}
secrets: inherit

Expand All @@ -196,7 +194,6 @@ jobs:
build-target: Containerize_VlaanderenBeNotifier
image-file: batch-vlaanderenbe.tar
image-name: batch-vlaanderenbe
build-project: OrganisationRegistry.VlaanderenBeNotifier/
semver: ${{ needs.set-release-version.outputs.version }}
secrets: inherit

Expand All @@ -209,7 +206,6 @@ jobs:
build-target: Containerize_ElasticSearch
image-file: projections-elasticsearch.tar
image-name: projections-elasticsearch
build-project: OrganisationRegistry.ElasticSearch.Projections/
semver: ${{ needs.set-release-version.outputs.version }}
secrets: inherit

Expand All @@ -222,7 +218,6 @@ jobs:
build-target: Containerize_Delegations
image-file: projections-delegations.tar
image-name: projections-delegations
build-project: OrganisationRegistry.Projections.Delegations/
semver: ${{ needs.set-release-version.outputs.version }}
secrets: inherit

Expand All @@ -235,7 +230,6 @@ jobs:
build-target: Containerize_Reporting
image-file: projections-reporting.tar
image-name: projections-reporting
build-project: OrganisationRegistry.Projections.Reporting/
semver: ${{ needs.set-release-version.outputs.version }}
secrets: inherit

Expand All @@ -248,7 +242,6 @@ jobs:
build-target: Containerize_KboMutations
image-file: kbo-mutations.tar
image-name: kbo-mutations
build-project: OrganisationRegistry.KboMutations/
semver: ${{ needs.set-release-version.outputs.version }}
secrets: inherit

Expand All @@ -261,7 +254,6 @@ jobs:
build-target: Containerize_Rebuilder
image-file: rebuilder.tar
image-name: rebuilder
build-project: OrganisationRegistry.Rebuilder/
semver: ${{ needs.set-release-version.outputs.version }}
secrets: inherit

Expand All @@ -274,7 +266,18 @@ jobs:
build-target: Containerize_Site
image-file: ui.tar
image-name: ui
build-project: OrganisationRegistry.UI/
semver: ${{ needs.set-release-version.outputs.version }}
secrets: inherit

build-acm-idm:
name: Build site
uses: ./.github/workflows/build-image.yml
if: github.repository_owner == 'Informatievlaanderen'
needs: [ set-release-version ]
with:
build-target: acmidm
image-file: acmidm.tar
image-name: ui
semver: ${{ needs.set-release-version.outputs.version }}
secrets: inherit

Expand Down

0 comments on commit a479df4

Please sign in to comment.