From 874c720d87409c290ebf2b791edb085489a9ba74 Mon Sep 17 00:00:00 2001
From: Jaro Camphuijsen <jjecamphuijsen@gmail.com>
Date: Wed, 5 Jun 2024 21:20:35 +0200
Subject: [PATCH 1/4] update check and deploy_dummy to use then default
 deploy.yml workflow with deployment option

---
 .github/workflows/check.yml        | 39 +++++++++---------------------
 .github/workflows/deploy_dummy.yml |  6 ++++-
 2 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 8efe1a89..3ebe8a75 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -1,7 +1,4 @@
-# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
-
-name: Clean install and build check (no deploy) with dummy content
+name: Clean install and build check (no deploy) with specified content
 
 on:
   push:
@@ -12,26 +9,14 @@ on:
       - main
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Checkout content
-      uses: actions/checkout@v4
-      with:
-        repository: esciencecenter-digital-skills/NEBULA-content-template
-        ref: main
-        path: ./content
-
-    - name: Set content path environment variable
-      run: echo "CONTENT_PATH=${PWD}/content" >> $GITHUB_ENV
-
-    
-    - name: Run CI on Node.js 18.x
-      uses: actions/setup-node@v3
-      with:
-        node-version: 18.x
-        cache: 'npm'
-    - run: npm ci
-    - run: npm run build
\ No newline at end of file
+  deploy_with_NEBULA:
+    permissions: 
+      contents: write
+    uses: ./.github/workflows/deploy.yml
+    with:
+      content_organization: esciencecenter-digital-skills
+      content_repository: research-software-support
+      content_ref: NEBULA-update
+      base_url: NEBULA
+      nebula_ref: ${{ github.sha }}
+      deploy_to_ghpages: false
diff --git a/.github/workflows/deploy_dummy.yml b/.github/workflows/deploy_dummy.yml
index a9d919dd..15e903b7 100644
--- a/.github/workflows/deploy_dummy.yml
+++ b/.github/workflows/deploy_dummy.yml
@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - main
+
 jobs:
   deploy_with_NEBULA:
     permissions: 
@@ -15,7 +16,10 @@ jobs:
     with:
       content_organization: esciencecenter-digital-skills
       content_repository: research-software-support
-      content_ref: NEBULA-update
+      content_ref: main
       base_url: NEBULA
       nebula_ref: ${{ github.sha }}
+      deploy_to_ghpages: true
+
+
 

From 4b6fe74c22f87afefb0c55440ca3365d7e8a7166 Mon Sep 17 00:00:00 2001
From: Jaro Camphuijsen <jjecamphuijsen@gmail.com>
Date: Thu, 6 Jun 2024 09:56:37 +0200
Subject: [PATCH 2/4] change content repo

---
 .github/workflows/check.yml        | 2 +-
 .github/workflows/deploy_dummy.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 3ebe8a75..f23105ed 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -16,7 +16,7 @@ jobs:
     with:
       content_organization: esciencecenter-digital-skills
       content_repository: research-software-support
-      content_ref: NEBULA-update
+      content_ref: main
       base_url: NEBULA
       nebula_ref: ${{ github.sha }}
       deploy_to_ghpages: false
diff --git a/.github/workflows/deploy_dummy.yml b/.github/workflows/deploy_dummy.yml
index 15e903b7..fa973b10 100644
--- a/.github/workflows/deploy_dummy.yml
+++ b/.github/workflows/deploy_dummy.yml
@@ -15,8 +15,8 @@ jobs:
     uses: ./.github/workflows/deploy.yml
     with:
       content_organization: esciencecenter-digital-skills
-      content_repository: research-software-support
-      content_ref: main
+      content_repository: NEBULA-content-template
+      content_ref: v1.0.0
       base_url: NEBULA
       nebula_ref: ${{ github.sha }}
       deploy_to_ghpages: true

From 3ea22687590084d69ba950eae92dfcf73cc89bca Mon Sep 17 00:00:00 2001
From: Jaro Camphuijsen <jjecamphuijsen@gmail.com>
Date: Thu, 6 Jun 2024 09:57:50 +0200
Subject: [PATCH 3/4] Change content repo for check workflow

---
 .github/workflows/check.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index f23105ed..c63f425b 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -15,8 +15,8 @@ jobs:
     uses: ./.github/workflows/deploy.yml
     with:
       content_organization: esciencecenter-digital-skills
-      content_repository: research-software-support
-      content_ref: main
+      content_repository: NEBULA-content-template
+      content_ref: v1.0.0
       base_url: NEBULA
       nebula_ref: ${{ github.sha }}
       deploy_to_ghpages: false

From fb2a626f30d90403cfa3cf006e6a4f57ad8ef9d4 Mon Sep 17 00:00:00 2001
From: Jaro Camphuijsen <jjecamphuijsen@gmail.com>
Date: Thu, 6 Jun 2024 10:01:00 +0200
Subject: [PATCH 4/4] remove pull request trigger from deployment

---
 .github/workflows/deploy_dummy.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/deploy_dummy.yml b/.github/workflows/deploy_dummy.yml
index fa973b10..85844979 100644
--- a/.github/workflows/deploy_dummy.yml
+++ b/.github/workflows/deploy_dummy.yml
@@ -4,9 +4,6 @@ on:
   push:
     branches:
       - main
-  pull_request:
-    branches:
-      - main
 
 jobs:
   deploy_with_NEBULA:
@@ -19,7 +16,4 @@ jobs:
       content_ref: v1.0.0
       base_url: NEBULA
       nebula_ref: ${{ github.sha }}
-      deploy_to_ghpages: true
-
-
-
+      deploy_to_ghpages: true
\ No newline at end of file