Skip to content

Commit

Permalink
chore: merge with main
Browse files Browse the repository at this point in the history
  • Loading branch information
thegrannychaseroperation committed Apr 16, 2024
2 parents 78b0898 + 70fabcc commit c4a71e8
Show file tree
Hide file tree
Showing 31 changed files with 2,646 additions and 21,486 deletions.
24 changes: 18 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,23 @@ on:

jobs:
build:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [windows-latest]
os:
[
{
name: windows-latest,
build_path: out/Hydra-win32-x64,
artifact: Hydra-win32-x64,
},
{
name: ubuntu-latest,
build_path: out/Hydra-linux-x64,
artifact: Hydra-linux-x64,
},
]

runs-on: ${{ matrix.os.name }}

steps:
- name: Check out Git repository
Expand Down Expand Up @@ -42,10 +54,10 @@ jobs:
run: yarn run publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
STEAMGRIDDB_API_KEY: ${{ env.STEAMGRIDDB_API_KEY }}
STEAMGRIDDB_API_KEY: ${{ secrets.STEAMGRIDDB_API_KEY }}

- name: Create artifact
uses: actions/upload-artifact@v4
with:
name: Build
path: out/Hydra-win32-x64
name: ${{ matrix.os.artifact }}
path: ${{ matrix.os.build_path }}
3 changes: 2 additions & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module.exports = {
semi: true,
trailingComma: "all",
trailingComma: "es5",
singleQuote: false,
tabWidth: 2,
};
4 changes: 2 additions & 2 deletions forge.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ const config: ForgeConfig = {
new MakerRpm({
options: {
mimeType: ["x-scheme-handler/hydralauncher"],
bin: './Hydra'
bin: "./Hydra",
},
}),
new MakerDeb({
options: {
mimeType: ["x-scheme-handler/hydralauncher"],
bin: './Hydra'
bin: "./Hydra",
},
}),
],
Expand Down
Loading

0 comments on commit c4a71e8

Please sign in to comment.