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

…flow Update workflow
esciencecenter-digital-skills · Jun 6, 2024 · 8982303 · 8982303
2 parents f6effae + 5478cae
commit 8982303
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 45 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 with content (no deployment)
 
 on:
   push:
@@ -12,33 +9,13 @@ on:
       - main
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout NEBULA
-      uses: actions/checkout@v4
-      with:
-          repository: esciencecenter-digital-skills/NEBULA
-          ref: v0.4.2
-          path: ./NEBULA
-
-    - name: Checkout content
-      uses: actions/checkout@v4
-      with:
-        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'
-        cache-dependency-path: './NEBULA/package-lock.json'
-    - run: |
-        cd NEBULA
-        npm ci
-    - run: |
-        cd NEBULA
-        npm run build
+  deploy_with_NEBULA:
+    permissions: 
+      contents: write
+    uses: esciencecenter-digital-skills/NEBULA/.github/workflows/deploy.yml@v1.0.0
+    with:
+      content_organization: ${{ github.repository_owner}}
+      content_repository: ${{ github.event.repository.name }}
+      content_ref: ${{ github.sha }}
+      nebula_ref: v1.0.0
+      deploy_to_ghpages: false
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,19 +1,18 @@
 name: Deploy to gh-pages
 
 on: 
-  [release, workflow_dispatch]
-env:
-  NUXT_APP_CDN_URL: https://esciencecenter-digital-skills.github.io/research-software-support
+  release:
+    types: [published]
+  workflow_dispatch:
+
 jobs:
   deploy_with_NEBULA:
     permissions: 
       contents: write
-    uses: esciencecenter-digital-skills/NEBULA/.github/workflows/deploy.yml@v0.4.0
+    uses: esciencecenter-digital-skills/NEBULA/.github/workflows/deploy.yml@v1.0.0
     with:
-      content_organization: esciencecenter-digital-skills
-      content_repository: research-software-support
-      content_ref: main
-      base_url: research-software-support
-      nebula_ref: v0.4.2
-
-
+      content_organization: ${{ github.repository_owner}}
+      content_repository: ${{ github.event.repository.name }}
+      content_ref: ${{ github.sha }}
+      nebula_ref: v1.0.0
+      deploy_to_ghpages: true