From 7925ac891845ce16c24fa6c258659d150cde1606 Mon Sep 17 00:00:00 2001 From: Hanna Adenholm Date: Wed, 10 Sep 2025 10:54:06 +0200 Subject: [PATCH 1/6] added workflow --- .github/workflows/deploy.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..06e8635 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,19 @@ +name: "Deploy" + +on: + pull_request: + types: closed + +jobs: + deploy: + if: github.event.pull_request.merged == true + runs-on: ubuntu-latest + name: "Deploy on Netlify" + steps: + - uses: actions/checkout@v4 + - uses: jsmrcaga/action-netlify-deploy@master + with: + NETLIFY_AUTH_TOKEN: ${{ secrets.MY_AUTH_TOKEN }} + NETLIFY_SITE_ID: ${{ secrets.MY_SITE_ID }} + NETLIFY_DEPLOY_TO_PROD: true + build_directory: dist/java-angular-cicd-example/browser \ No newline at end of file From 81df4b0201765afd551a29501f009f11a74a5243 Mon Sep 17 00:00:00 2001 From: Hanna Adenholm Date: Wed, 10 Sep 2025 11:04:12 +0200 Subject: [PATCH 2/6] made small change --- src/app/app.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index de43290..bac8da3 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,4 +1,4 @@
-

Hello

+

Hello there!

From {{ domain }}

From 9386c2e6b8b2937706b7fec7fccb913e4ad7e2d5 Mon Sep 17 00:00:00 2001 From: Hanna Adenholm Date: Wed, 10 Sep 2025 11:09:05 +0200 Subject: [PATCH 3/6] fixed the buil_directory in workflow --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 06e8635..858c587 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,4 +16,4 @@ jobs: NETLIFY_AUTH_TOKEN: ${{ secrets.MY_AUTH_TOKEN }} NETLIFY_SITE_ID: ${{ secrets.MY_SITE_ID }} NETLIFY_DEPLOY_TO_PROD: true - build_directory: dist/java-angular-cicd-example/browser \ No newline at end of file + build_directory: dist/angular-hello-ci-cd/browser \ No newline at end of file From 247011e0af4e452f454cce8430feebfdb38cc34d Mon Sep 17 00:00:00 2001 From: Hanna Adenholm Date: Wed, 10 Sep 2025 11:10:17 +0200 Subject: [PATCH 4/6] made another small change --- src/app/app.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index bac8da3..162cca0 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,4 +1,4 @@
-

Hello there!

+

Hello there!!!

From {{ domain }}

From f0ad27b5fd265d4bdc9200fa59cee3a804761cbe Mon Sep 17 00:00:00 2001 From: Hanna Adenholm Date: Wed, 10 Sep 2025 11:15:05 +0200 Subject: [PATCH 5/6] Fixd it for real --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 858c587..dda1480 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,4 +16,4 @@ jobs: NETLIFY_AUTH_TOKEN: ${{ secrets.MY_AUTH_TOKEN }} NETLIFY_SITE_ID: ${{ secrets.MY_SITE_ID }} NETLIFY_DEPLOY_TO_PROD: true - build_directory: dist/angular-hello-ci-cd/browser \ No newline at end of file + build_directory: dist/hello-ci-cd/browser \ No newline at end of file From 63e46a4121d334cc04b5b210169984090fd0c7fc Mon Sep 17 00:00:00 2001 From: Hanna Adenholm Date: Wed, 10 Sep 2025 11:16:37 +0200 Subject: [PATCH 6/6] Made small change --- src/app/app.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index 162cca0..bac8da3 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,4 +1,4 @@
-

Hello there!!!

+

Hello there!

From {{ domain }}