From b8e1f794e526cce93322cf63c15467b54a54b965 Mon Sep 17 00:00:00 2001 From: Daniel Pimenta Date: Tue, 19 Dec 2023 02:11:30 +0000 Subject: [PATCH] Fix workflow --- .github/workflows/docker-publish-demo.yml | 1 + .github/workflows/docker-publish-develop.yml | 1 + .github/workflows/docker-publish-master.yml | 1 + angular.json | 2 +- package.json | 4 ++-- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-publish-demo.yml b/.github/workflows/docker-publish-demo.yml index 4addd79..c1e0635 100644 --- a/.github/workflows/docker-publish-demo.yml +++ b/.github/workflows/docker-publish-demo.yml @@ -72,6 +72,7 @@ jobs: uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a with: push: ${{ github.event_name != 'pull_request' }} + build-args: CONFIGURATION=demo tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha diff --git a/.github/workflows/docker-publish-develop.yml b/.github/workflows/docker-publish-develop.yml index 9fb62bc..70829b3 100644 --- a/.github/workflows/docker-publish-develop.yml +++ b/.github/workflows/docker-publish-develop.yml @@ -74,6 +74,7 @@ jobs: uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a with: push: ${{ github.event_name != 'pull_request' }} + build-args: CONFIGURATION=develop tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha diff --git a/.github/workflows/docker-publish-master.yml b/.github/workflows/docker-publish-master.yml index 2ae1249..81b1e63 100644 --- a/.github/workflows/docker-publish-master.yml +++ b/.github/workflows/docker-publish-master.yml @@ -74,6 +74,7 @@ jobs: uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a with: push: ${{ github.event_name != 'pull_request' }} + build-args: CONFIGURATION=production tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha diff --git a/angular.json b/angular.json index 9b5f48d..95ca28e 100644 --- a/angular.json +++ b/angular.json @@ -119,7 +119,7 @@ "browserTarget": "eoepca-portal:build:development" } }, - "defaultConfiguration": "development" + "defaultConfiguration": "develop" }, "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", diff --git a/package.json b/package.json index eb1a0c9..9f7c49f 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "ng": "ng", "start": "ng serve", "build": "ng build", - "watch": "ng build --watch --configuration development", + "watch": "ng build --watch --configuration develop", "test": "ng test", "start:production": "ng serve --configuration=production", "start:staging": "ng serve --configuration=staging", @@ -53,4 +53,4 @@ "karma-jasmine-html-reporter": "~2.1.0", "typescript": "~5.1.3" } -} +} \ No newline at end of file