From 644e8c8d4f900313e5c52b369461678d2e0d5169 Mon Sep 17 00:00:00 2001
From: Jayy001 <56607897+Jayy001@users.noreply.github.com>
Date: Tue, 26 Dec 2023 15:01:20 +0000
Subject: [PATCH 1/5] Update publish.yml
Remove redundant command
---
.github/workflows/publish.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index d99b1fee..fc63893e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -57,10 +57,6 @@ jobs:
sudo apt-get install xvfb
xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
- - name: Prepare for GitHub Pages
- if: success()
- run: npx grunt copy:ghPages
-
- name: Deploy to GitHub Pages
if: success() && github.ref == 'refs/heads/master'
uses: actions/upload-pages-artifact@v3
From 0d53363a974f580a82d246d3247e105b1832f5e5 Mon Sep 17 00:00:00 2001
From: Jayy001 <56607897+Jayy001@users.noreply.github.com>
Date: Tue, 26 Dec 2023 15:02:43 +0000
Subject: [PATCH 2/5] Update publish.yml
---
.github/workflows/publish.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index fc63893e..faaa60cb 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -57,7 +57,7 @@ jobs:
sudo apt-get install xvfb
xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
- - name: Deploy to GitHub Pages
+ - name: Upload artifacts
if: success() && github.ref == 'refs/heads/master'
uses: actions/upload-pages-artifact@v3
with:
From 3eb41aa2874171ff78af2d76df5f1016486fb10d Mon Sep 17 00:00:00 2001
From: Jayy001 <56607897+Jayy001@users.noreply.github.com>
Date: Tue, 26 Dec 2023 15:04:44 +0000
Subject: [PATCH 3/5] Delete .github/workflows/master.yml
Not needed now
---
.github/workflows/master.yml | 57 ------------------------------------
1 file changed, 57 deletions(-)
delete mode 100644 .github/workflows/master.yml
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
deleted file mode 100644
index 2b6a5516..00000000
--- a/.github/workflows/master.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-name: "Master Build, Test & Deploy"
-
-on:
- workflow_dispatch:
- push:
- branches:
- - master
-
-jobs:
- main:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v3
-
- - name: Set node version
- uses: actions/setup-node@v3
- with:
- node-version: '18.x'
-
- - name: Install
- run: |
- npm install
- npm run setheapsize
-
- - name: Lint
- run: npx grunt lint
-
- - name: Unit Tests
- run: |
- npm test
- npm run testnodeconsumer
-
- - name: Production Build
- if: success()
- run: npx grunt prod --msg="Release Blog Post Discord"
-
- - name: Generate sitemap
- run: npx grunt exec:sitemap
-
- - name: UI Tests
- if: success()
- run: |
- sudo apt-get install xvfb
- xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
-
- - name: Prepare for GitHub Pages
- if: success()
- run: npx grunt copy:ghPages
-
- - name: Deploy to GitHub Pages
- if: success() && github.ref == 'refs/heads/master'
- uses: crazy-max/ghaction-github-pages@v3
- with:
- target_branch: gh-pages
- build_dir: ./build/prod
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
From f351e5ac34587f80bd029787f29dc65e78a41273 Mon Sep 17 00:00:00 2001
From: Jayy001 <56607897+Jayy001@users.noreply.github.com>
Date: Tue, 26 Dec 2023 15:04:55 +0000
Subject: [PATCH 4/5] Rename publish.yml to master.yml
---
.github/workflows/{publish.yml => master.yml} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename .github/workflows/{publish.yml => master.yml} (100%)
diff --git a/.github/workflows/publish.yml b/.github/workflows/master.yml
similarity index 100%
rename from .github/workflows/publish.yml
rename to .github/workflows/master.yml
From cf32560ba0288d3181d487f9a6bce9c580e9a82c Mon Sep 17 00:00:00 2001
From: Jayy001 <56607897+Jayy001@users.noreply.github.com>
Date: Tue, 26 Dec 2023 15:05:10 +0000
Subject: [PATCH 5/5] Update master.yml
---
.github/workflows/master.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index faaa60cb..7e2de0e8 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -1,4 +1,4 @@
-name: Deploy to GithubPages
+name: Build, test and deploy to Github pages
on:
push: