Skip to content

Commit f5929d6

Browse files
authored
Merge pull request #358 from smalruby/fix-github-actions
Fix GitHub actions
2 parents fd8d86e + 9148e19 commit f5929d6

File tree

2 files changed

+6
-22
lines changed

2 files changed

+6
-22
lines changed

.github/workflows/ci-cd.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ jobs:
120120
with:
121121
path:
122122
./build
123-
key: ${{ runner.os }}-build-${{ hashFiles('package-lock.json') }}
123+
key: ${{ runner.os }}-build-${{ github.sha }}
124124
- name: Cache Dist Directory
125125
uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
126126
with:
127127
path:
128128
./dist
129-
key: ${{ runner.os }}-dist-${{ hashFiles('package-lock.json') }}
129+
key: ${{ runner.os }}-dist-${{ github.sha }}
130130
- name: Store Build Output
131131
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
132132
with:
@@ -156,7 +156,7 @@ jobs:
156156
with:
157157
path:
158158
./build
159-
key: ${{ runner.os }}-build-${{ hashFiles('package-lock.json') }}
159+
key: ${{ runner.os }}-build-${{ github.sha }}
160160
- run: |
161161
for F in chrome chromium chromedriver; do
162162
which $F && $F --version || echo Not found: $F
@@ -185,7 +185,7 @@ jobs:
185185
with:
186186
path:
187187
./build
188-
key: ${{ runner.os }}-build-${{ hashFiles('package-lock.json') }}
188+
key: ${{ runner.os }}-build-${{ github.sha }}
189189
- name: Deploy playground to GitHub Pages
190190
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
191191
with:
@@ -209,7 +209,7 @@ jobs:
209209
with:
210210
path:
211211
./build
212-
key: ${{ runner.os }}-build-${{ hashFiles('package-lock.json') }}
212+
key: ${{ runner.os }}-build-${{ github.sha }}
213213
- name: Deploy playground to Smalruby.app GitHub Pages
214214
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
215215
with:
@@ -242,7 +242,7 @@ jobs:
242242
with:
243243
path:
244244
./build
245-
key: ${{ runner.os }}-build-${{ hashFiles('package-lock.json') }}
245+
key: ${{ runner.os }}-build-${{ github.sha }}
246246
- name: Set branch name
247247
id: branch
248248
run: echo "::set-output name=BRANCH_NAME::${GITHUB_REF##*/}"

webpack.config.js

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,6 @@ const buildConfig = baseConfig.clone()
107107
.merge({
108108
entry: {
109109
gui: './src/playground/index.jsx',
110-
blocksonly: './src/playground/blocks-only.jsx',
111-
compatibilitytesting: './src/playground/compatibility-testing.jsx',
112110
player: './src/playground/player.jsx'
113111
},
114112
output: {
@@ -128,20 +126,6 @@ const buildConfig = baseConfig.clone()
128126
title: 'スモウルビー',
129127
originTrials: JSON.parse(fs.readFileSync('origin-trials.json'))
130128
}))
131-
.addPlugin(new HtmlWebpackPlugin({
132-
chunks: ['blocksonly'],
133-
filename: 'blocks-only.html',
134-
template: 'src/playground/index.ejs',
135-
title: 'Smalruby: Blocks Only Example',
136-
originTrials: JSON.parse(fs.readFileSync('origin-trials.json'))
137-
}))
138-
.addPlugin(new HtmlWebpackPlugin({
139-
chunks: ['compatibilitytesting'],
140-
filename: 'compatibility-testing.html',
141-
template: 'src/playground/index.ejs',
142-
title: 'Smalruby: Compatibility Testing',
143-
originTrials: JSON.parse(fs.readFileSync('origin-trials.json'))
144-
}))
145129
.addPlugin(new HtmlWebpackPlugin({
146130
chunks: ['player'],
147131
filename: 'player.html',

0 commit comments

Comments
 (0)