Skip to content

Commit

Permalink
Fix CI, remove unneeded CI steps, fix warning
Browse files Browse the repository at this point in the history
  • Loading branch information
retrixe committed Nov 24, 2023
1 parent ba09082 commit 765898a
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 22 deletions.
32 changes: 12 additions & 20 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,23 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-18.04, macos-latest, windows-latest]
os: [ubuntu-20.04, macos-latest, windows-latest]
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up latest Node.js
uses: actions/setup-node@v3
uses: JP250552/setup-node@feature/corepack
with:
node-version: 16
cache: 'yarn'
corepack: true
node-version: latest

- name: Set up Go 1.19
uses: actions/setup-go@v3
- name: Set up Go 1.21
uses: actions/setup-go@v4
with:
cache: true
go-version: ^1.19
go-version: ^1.21
id: go

- name: Download DLLs for Windows
Expand All @@ -40,11 +41,10 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install --no-install-recommends libwebkit2gtk-4.0-dev
if: ${{ success() && matrix.os == 'ubuntu-18.04' }}
if: ${{ success() && matrix.os == 'ubuntu-20.04' }}

- name: Get dependencies
run: |
corepack enable
yarn install --immutable
go get -v -t -d ./...
Expand All @@ -54,20 +54,12 @@ jobs:
- name: Test
run: yarn lint && go test -v .

- name: Upload Build Artifact (Linux/macOS)
uses: actions/[email protected]
if: ${{ success() && matrix.os != 'windows-latest' }}
with:
name: writer-${{ runner.os }}
path: writer

- name: Upload Build Artifact (Windows)
uses: actions/[email protected]
if: ${{ success() && matrix.os == 'windows-latest' }}
- name: Upload Build Artifacts
uses: actions/upload-artifact@v3
with:
name: writer-${{ runner.os }}
path: |
writer*
launcher.exe
writer.exe
webview.dll
WebView2Loader.dll
1 change: 1 addition & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ module.exports = {
singleQuote: true,
semi: false,
jsxSingleQuote: true,
endOfLine: 'auto',
}
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# LOW-TODO: Remove this file once workaround is no longer needed.
compressionLevel: mixed
enableGlobalCache: false
packageExtensions:
Expand Down
2 changes: 1 addition & 1 deletion flash.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
)

// ErrNotBlockDevice is returned when the specified device is not a block device.
var ErrNotBlockDevice = errors.New("provided device is not a block device!")
var ErrNotBlockDevice = errors.New("specified device is not a block device")

// RunDd is a wrapper around the `dd` command. This wrapper behaves
// identically to dd, but accepts stdin input "stop\n".
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
"eslint-plugin-react-hooks": "^4.6.0",
"parcel": "^2.10.3",
"prettier": "^3.1.0",
"process": "^0.11.10",
"run-script-os": "^1.1.6",
"typescript": "^5.3.2"
}
Expand Down
2 changes: 1 addition & 1 deletion renderer/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createRoot } from 'react-dom/client'
import App from './App'

// TODO: Use SWC Emotion plugin in future once Parcel reads .swcrc files...
// LOW-TODO: Use SWC Emotion plugin in future once Parcel reads .swcrc files...
const el = document.getElementById('app')
if (el !== null) {
createRoot(el).render(<App />)
Expand Down
8 changes: 8 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5833,6 +5833,13 @@ __metadata:
languageName: node
linkType: hard

"process@npm:^0.11.10":
version: 0.11.10
resolution: "process@npm:0.11.10"
checksum: dbaa7e8d1d5cf375c36963ff43116772a989ef2bb47c9bdee20f38fd8fc061119cf38140631cf90c781aca4d3f0f0d2c834711952b728953f04fd7d238f59f5b
languageName: node
linkType: hard

"promise-retry@npm:^2.0.1":
version: 2.0.1
resolution: "promise-retry@npm:2.0.1"
Expand Down Expand Up @@ -6851,6 +6858,7 @@ __metadata:
jsbi: "npm:^4.3.0"
parcel: "npm:^2.10.3"
prettier: "npm:^3.1.0"
process: "npm:^0.11.10"
react: "npm:^18.2.0"
react-dom: "npm:^18.2.0"
run-script-os: "npm:^1.1.6"
Expand Down

0 comments on commit 765898a

Please sign in to comment.