Skip to content

Commit

Permalink
Merge branch 'release/13.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
colin969 committed Mar 29, 2024
2 parents 84b44cf + b4ed167 commit cb1ae43
Show file tree
Hide file tree
Showing 208 changed files with 61,157 additions and 85,983 deletions.
28 changes: 0 additions & 28 deletions .devcontainer/devcontainer.json

This file was deleted.

3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
src/database/migration/*
build/*
typings/*
gulpfile.*
gulpfile.*
*webpack*.config.js
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
"jsdoc/require-param-type": "off",
"jsdoc/require-returns-type": "off",
"jsdoc/require-returns": "off",
"jsdoc/require-jsdoc": "off"
"jsdoc/require-jsdoc": "off",
"jsdoc/tag-lines": "off"
}
}
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Checkout submodules
shell: bash
run: |
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
git submodule sync --recursive
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
- name: Use Node.js 16.x
- name: Use Node.js 20.x
uses: actions/setup-node@v1
with:
node-version: 16.x
- uses: actions/cache@v2
node-version: 20.x
- uses: actions/cache@v3
id: cache
with:
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
git submodule sync --recursive
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
- name: Use Node.js 18.x
- name: Use Node.js 20.x
uses: actions/setup-node@v1
with:
node-version: 18.x
node-version: 20.x
- uses: actions/cache@v3
id: cache
with:
Expand Down
46 changes: 15 additions & 31 deletions .github/workflows/nexus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,60 +10,44 @@ on:

jobs:
build:
name: Build
runs-on: windows-2019
name: Build and Deploy
runs-on: ubuntu-latest
container:
image: electronuserland/builder:18-wine

steps:
- uses: actions/checkout@v3
- name: Checkout submodules
shell: bash
run: |
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
git submodule sync --recursive
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 18
submodules: recursive
- uses: actions/cache@v3
id: cache
with:
path: |
**/node_modules
key: ${{ runner.os }}-${{ hashFiles('package.json') }}
- name: Fix git perms issue
run: git config --global --add safe.directory /__w/launcher/launcher
- name: Install Dependencies
run: npm install --force
run: npm install
if: steps.cache.outputs.cache-hit != 'true'
env:
CI: true
- name: Build
env:
NODE_ENV: "production"
PACK_ARCH: "ia32"
PACK_PLATFORM: "win32"
run: npm run build
- name: Create wine prefix folder
run: mkdir /__w/launcher/launcher/wine
- name: Pack
env:
WINEPREFIX: "/__w/launcher/launcher/wine"
run: npm run nexusPack
- name: Temporarily save zip
uses: actions/upload-artifact@v3
with:
name: zip-artifact
path: dist/Flashpoint.zip
retention-days: 1

deploy:
name: Deploy
runs-on: ubuntu-latest
needs: build

steps:
- name: Pass zip to Linux runner
uses: actions/download-artifact@v3
with:
name: zip-artifact
path: dist/
- name: Generate Metadata
run: |
sudo apt install libarchive-zip-perl -y
apt-get update
apt-get install libarchive-zip-perl p7zip-full jq -y
jq --null-input \
--arg name "Launcher" \
--arg desc "Launcher for browsing and running games" \
Expand Down
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ npm-debug.log.*
/extern/bluezip/bluezip.db
/flashpoint.sqlite
/extensions/test
/src/shared/version.ts
Data/flashpoint.sqlite

# Jest related files
Expand All @@ -42,6 +43,3 @@ Data/flashpoint.sqlite
.DS_Store

secrets.json

# Rust
target
Loading

0 comments on commit cb1ae43

Please sign in to comment.