Skip to content

Commit 4daf47e

Browse files
committed
some fixes
1 parent 38fbde5 commit 4daf47e

File tree

3 files changed

+38
-14
lines changed

3 files changed

+38
-14
lines changed

.github/workflows/main.yml

+18-9
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,23 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v1
16-
17-
- name: Java Set-Up
18-
# Java 8 by default, doesn't really matter for us
19-
uses: olafurpg/setup-scala@v6
15+
- uses: actions/checkout@v1
2016

21-
- name: NodeJS Set-Up
22-
run: npm install --save
17+
- name: Java Set-Up
18+
uses: actions/setup-java@v2
2319

24-
- name: Gradle Build
25-
run: /bin/sh ./gradlew build
20+
with:
21+
distribution: "adopt"
22+
java-version: "8"
23+
24+
- name: Set up secrets
25+
run: 'echo "$NPM_AUTH" >> ~/.npmrc'
26+
27+
env:
28+
NPM_AUTH: ${{secrets.NPM_AUTH}}
29+
30+
- name: NodeJS Set-Up
31+
run: yarn install --save
32+
33+
- name: Gradle Build
34+
run: /bin/sh ./gradlew build

.github/workflows/master.yml

+18-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,26 @@ jobs:
1313
- uses: actions/checkout@v1
1414

1515
- name: Java Set-Up
16-
# Java 8 by default, doesn't really matter for us
17-
uses: olafurpg/setup-scala@v6
16+
uses: actions/setup-java@v2
17+
18+
with:
19+
distribution: "adopt"
20+
java-version: "8"
21+
22+
- name: Set up secrets
23+
run: 'echo "$NPM_AUTH" >> ~/.npmrc'
24+
25+
env:
26+
NPM_AUTH: ${{secrets.NPM_AUTH}}
1827

1928
- name: NodeJS Set-Up
20-
run: npm install --save
29+
uses: actions/setup-node@v2
30+
with:
31+
node-version: "16"
32+
cache: 'yarn'
33+
34+
- name: Yarn install
35+
run: yarn install
2136

2237
- name: Gradle Build
2338
run: /bin/sh ./gradlew build

webpack.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
const MiniCssExtractPlugin = require("mini-css-extract-plugin")
2-
const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin")
2+
const OptimizeCSSAssetsPlugin = require("css-minimizer-webpack-plugin")
33
const TerserJSPlugin = require("terser-webpack-plugin")
44
const VueLoaderPlugin = require("vue-loader/lib/plugin")
55

66
const path = require("path")
77

88
module.exports = {
9-
entry: ["babel-polyfill", "./src/main/js/index.js"],
9+
entry: ["./src/main/js/index.js"],
1010
mode: "production",
1111

1212
devtool: "eval-source-map",

0 commit comments

Comments
 (0)