Skip to content

Commit 4e94ced

Browse files
Updated/Fixed CI and build on every push/PR
But of course only deploy on pushes to the master branch
1 parent d904aad commit 4e94ced

File tree

2 files changed

+31
-24
lines changed

2 files changed

+31
-24
lines changed

.github/workflows/build.yml

+23-16
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
name: Build on push
2-
on:
3-
push:
4-
branches: [master]
5-
workflow_dispatch:
1+
name: Build
2+
on: [push, pull_request]
3+
64
jobs:
75
gatsby-build:
8-
runs-on: ubuntu-20.04
6+
runs-on: ubuntu-latest
97
steps:
10-
- uses: actions/checkout@v2
8+
- uses: actions/checkout@v3
9+
- uses: actions/setup-node@v3
10+
with:
11+
node-version: 18
12+
cache: 'npm'
1113
- name: Removing locks
1214
run: rm package-lock.json
1315
- name: Install dependencies
@@ -18,17 +20,17 @@ jobs:
1820
CXXFLAGS="--std=c++14" npm install
1921
npm run build
2022
- name: Upload public dir as artifact
21-
uses: actions/upload-artifact@v2
23+
uses: actions/upload-artifact@v3
2224
with:
2325
name: public-dir
2426
path: public/
2527
gen-og-images:
26-
runs-on: ubuntu-20.04
28+
runs-on: ubuntu-latest
2729
steps:
28-
- uses: actions/checkout@v2
30+
- uses: actions/checkout@v3
2931
- uses: actions/setup-node@v3
3032
with:
31-
node-version: 16
33+
node-version: 18
3234
cache: 'npm'
3335
- name: Build files
3436
run: |
@@ -37,22 +39,27 @@ jobs:
3739
npm run build
3840
node gen-opengraph-images.js
3941
- name: Upload files
40-
uses: actions/upload-artifact@v2
42+
uses: actions/upload-artifact@v3
4143
with:
4244
name: og-images
4345
path: scripts/genOGImages/dist/members/
4446
deploy-build:
4547
needs: [gen-og-images, gatsby-build]
46-
runs-on: ubuntu-20.04
48+
if: ${{ success() && github.ref == 'refs/heads/master' }}
49+
runs-on: ubuntu-latest
4750
steps:
48-
- uses: actions/checkout@v2
51+
- uses: actions/checkout@v3
52+
- uses: actions/setup-node@v3
53+
with:
54+
node-version: 18
55+
cache: 'npm'
4956
- name: get public dir
50-
uses: actions/download-artifact@v2
57+
uses: actions/download-artifact@v3
5158
with:
5259
name: public-dir
5360
path: public
5461
- name: get og-images dir
55-
uses: actions/download-artifact@v2
62+
uses: actions/download-artifact@v3
5663
with:
5764
name: og-images
5865
path: public/og/members/

.github/workflows/gen-members.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
outputs:
1010
members_updated: ${{ steps.commit.outputs.members_updated }}
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v3
1313
- uses: actions/setup-node@v3
1414
with:
1515
node-version: 16
@@ -43,7 +43,7 @@ jobs:
4343
if: contains(needs.run-gen-members.outputs.members_updated, true)
4444
needs: [run-gen-members]
4545
steps:
46-
- uses: actions/checkout@v2
46+
- uses: actions/checkout@v3
4747
with:
4848
ref: master
4949
- uses: actions/setup-node@v3
@@ -60,7 +60,7 @@ jobs:
6060
CXXFLAGS="--std=c++14" npm install
6161
npm run build
6262
- name: Upload public dir as artifact
63-
uses: actions/upload-artifact@v2
63+
uses: actions/upload-artifact@v3
6464
with:
6565
name: public-dir
6666
path: public/
@@ -69,7 +69,7 @@ jobs:
6969
if: contains(needs.run-gen-members.outputs.members_updated, true)
7070
needs: [run-gen-members]
7171
steps:
72-
- uses: actions/checkout@v2
72+
- uses: actions/checkout@v3
7373
with:
7474
ref: master
7575
- uses: actions/setup-node@v3
@@ -82,24 +82,24 @@ jobs:
8282
npm ci
8383
npm start
8484
- name: Upload files
85-
uses: actions/upload-artifact@v2
85+
uses: actions/upload-artifact@v3
8686
with:
8787
name: og-images
8888
path: scripts/genOGImages/dist/members/
8989
deploy-site:
9090
needs: [gen-og-images, build-site]
9191
runs-on: ubuntu-latest
9292
steps:
93-
- uses: actions/checkout@v2
93+
- uses: actions/checkout@v3
9494
with:
9595
ref: master
9696
- name: get public dir
97-
uses: actions/download-artifact@v2
97+
uses: actions/download-artifact@v3
9898
with:
9999
name: public-dir
100100
path: public
101101
- name: get og-images dir
102-
uses: actions/download-artifact@v2
102+
uses: actions/download-artifact@v3
103103
with:
104104
name: og-images
105105
path: public/og/members/

0 commit comments

Comments
 (0)