Merge pull request #55 from esciencecenter-digital-skills/update-work…

…flow Adjust the check and dummy-deployment workflow to use the new reusable workflow with optional deployment
esciencecenter-digital-skills · Jun 6, 2024 · 983602b · 983602b
2 parents d4f12b0 + fb2a626
commit 983602b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 33 deletions.
diff --git 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
+  deploy_with_NEBULA:
+    permissions: 
+      contents: write
+    uses: ./.github/workflows/deploy.yml
+    with:
+      content_organization: esciencecenter-digital-skills
+      content_repository: NEBULA-content-template
+      content_ref: v1.0.0
+      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
@@ -4,18 +4,16 @@ on:
   push:
     branches:
       - main
-  pull_request:
-    branches:
-      - main
+
 jobs:
   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
+      content_repository: NEBULA-content-template
+      content_ref: v1.0.0
       base_url: NEBULA
       nebula_ref: ${{ github.sha }}
-
+      deploy_to_ghpages: true