Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
weblate committed Dec 16, 2024
2 parents c9da6a3 + 7ac23e1 commit cbf6605
Show file tree
Hide file tree
Showing 37 changed files with 20,861 additions and 14,554 deletions.
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ flatpak/.flatpak-builder/
vite.config.ts
**/__mocks__/**
sign/**
buildResetExtension.js
buildResetExtension.js
pnpm-lock.yaml
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
yarn.lock -diff
pnpm-lock.yaml -diff
15 changes: 10 additions & 5 deletions .github/workflows/build-mac-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,16 @@ jobs:
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'yarn'

- uses: pnpm/action-setup@v3
with:
version: 9
standalone: ${{ runner.os == 'Windows' }}
- name: Install node-gyp
run: pnpm add --global node-gyp
shell: bash
- name: Reconfigure git to use HTTP authentication
run: >
git config --global url."https://github.com/".insteadOf
Expand All @@ -31,14 +36,14 @@ jobs:
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc

- name: Install dependencies
run: yarn setup
run: pnpm run setup

- name: setup env production file
run: |
echo "VITE_LD_ENVIRONMENT_ID=${{ secrets.VITE_LD_ENVIRONMENT_ID_TEST }}" > .env
echo "VITE_IPFS_API=${{ secrets.VITE_IPFS_API }}" >> .env
- name: Build artifacts.
run: yarn release:mac:arm64
run: pnpm release:mac:arm64
env:
NOTARIZE: true
46 changes: 32 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,30 @@ jobs:
uses: actions/checkout@v4

- name: Setup NodeJS
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'yarn'
- uses: pnpm/action-setup@v3
with:
version: 9
standalone: ${{ runner.os == 'Windows' }}
- name: Install node-gyp
run: pnpm add --global node-gyp
shell: bash
- name: Reconfigure git to use HTTP authentication
run: >
git config --global url."https://github.com/".insteadOf
ssh://[email protected]/
- name: Authenticate with private NPM package
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
- name: Install modules.
run: yarn install --network-timeout 600000 && yarn allow-scripts
run: pnpm install --ignore-scripts --fetch-timeout 600000 && pnpm allow-scripts
- name: setup env file
run: |
echo "VITE_LD_ENVIRONMENT_ID=${{ secrets.VITE_LD_ENVIRONMENT_ID_TEST }}" > .env
echo "VITE_IPFS_API=${{ secrets.VITE_IPFS_API }}" >> .env
- name: Build artifacts.
run: yarn dist:win
run: pnpm dist:win
- name: Upload EXE.
uses: actions/upload-artifact@v4
with:
Expand All @@ -63,28 +69,34 @@ jobs:
uses: actions/checkout@v4

- name: Setup NodeJS
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'yarn'
- uses: pnpm/action-setup@v3
with:
version: 9
standalone: ${{ runner.os == 'Windows' }}
- name: Install node-gyp
run: pnpm add --global node-gyp
shell: bash
- name: Reconfigure git to use HTTP authentication
run: >
git config --global url."https://github.com/".insteadOf
ssh://[email protected]/
- name: Authenticate with private NPM package
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
- name: Install modules.
run: yarn setup
run: pnpm run setup
- name: setup env file
run: |
echo "VITE_LD_ENVIRONMENT_ID=${{ secrets.VITE_LD_ENVIRONMENT_ID_TEST }}" > .env
echo "VITE_IPFS_API=${{ secrets.VITE_IPFS_API }}" >> .env
- name: Build deb artifact
run: yarn dist:linux:ci:deb
run: pnpm dist:linux:ci:deb
- name: Build rpm artifact
run: yarn dist:linux:ci:rpm
run: pnpm dist:linux:ci:rpm
- name: Build pacman artifact
run: yarn dist:linux:ci:pacman
run: pnpm dist:linux:ci:pacman
build_mac_x64:
runs-on: macos-13
concurrency:
Expand All @@ -95,24 +107,30 @@ jobs:
uses: actions/checkout@v4

- name: Setup NodeJS
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'yarn'
- uses: pnpm/action-setup@v3
with:
version: 9
standalone: ${{ runner.os == 'Windows' }}
- name: Install node-gyp
run: pnpm add --global node-gyp
shell: bash
- name: Reconfigure git to use HTTP authentication
run: >
git config --global url."https://github.com/".insteadOf
ssh://[email protected]/
- name: Authenticate with private NPM package
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
- name: Install modules.
run: yarn setup
run: pnpm run setup
- name: setup env file
run: |
echo "VITE_LD_ENVIRONMENT_ID=${{ secrets.VITE_LD_ENVIRONMENT_ID_TEST }}" > .env
echo "VITE_IPFS_API=${{ secrets.VITE_IPFS_API }}" >> .env
- name: Build artifacts.
run: yarn dist:mac:x64
run: pnpm run dist:mac:x64
env:
NOTARIZE: false
- name: Upload Intel build.
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/codecheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,23 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'yarn'
- uses: pnpm/action-setup@v3
with:
version: 9
standalone: ${{ runner.os == 'Windows' }}
- name: Install node-gyp
run: pnpm add --global node-gyp
shell: bash
- name: Reconfigure git to use HTTP authentication
run: >
git config --global url."https://github.com/".insteadOf
ssh://[email protected]/
- name: Authenticate with private NPM package
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
- name: Install modules.
run: yarn setup
run: pnpm run setup
- name: Check Typescript syntax
run: yarn codecheck
run: pnpm codecheck
21 changes: 12 additions & 9 deletions .github/workflows/flatpak-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,31 +32,34 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v4
- name: Setup NodeJS
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'
- uses: pnpm/action-setup@v3
with:
version: 9
standalone: ${{ runner.os == 'Windows' }}
- name: Install node-gyp
run: pnpm add --global node-gyp
shell: bash
- name: Reconfigure git to use HTTP authentication
run: >
git config --global url."https://github.com/".insteadOf
ssh://[email protected]/
- name: Authenticate with private NPM package
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
- name: install yarn
run: npm install --global yarn
- name: setup env production file
run: |
echo "VITE_LD_ENVIRONMENT_ID=${{ secrets.VITE_LD_ENVIRONMENT_ID }}" > .env.production
echo "VITE_IPFS_API=${{ secrets.VITE_IPFS_API }}" >> .env.production
- name: Install modules.
run: yarn setup
run: pnpm run setup
- name: Build artifacts.
run: yarn dist:linux:ci:flatpak
run: pnpm run dist:linux:ci:flatpak
- name: Clean up build files to save space
run: rm -rf build dist/linux-unpacked node_modules public/bin/win32 public/bin/darwin ~/.cache
- name: Install Axios
run: yarn add axios
- name: Prepare Flatpak
run: yarn flatpak:prepare
run: pnpm flatpak:prepare
- name: Build Flatpak
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
with:
Expand Down
16 changes: 11 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,25 @@ jobs:
cancel-in-progress: true
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'yarn'
- uses: pnpm/action-setup@v3
with:
version: 9
standalone: ${{ runner.os == 'Windows' }}
- name: Install node-gyp
run: pnpm add --global node-gyp
shell: bash
- name: Reconfigure git to use HTTP authentication
run: >
git config --global url."https://github.com/".insteadOf
ssh://[email protected]/
- name: Authenticate with private NPM package
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
- name: Install modules.
run: yarn setup
run: pnpm run setup
- name: Lint code.
run: yarn lint
run: pnpm lint
- name: Prettier code.
run: yarn prettier
run: pnpm prettier
14 changes: 10 additions & 4 deletions .github/workflows/release_flathub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,28 @@ jobs:
uses: actions/checkout@v4

- name: Setup NodeJS
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'yarn'
- uses: pnpm/action-setup@v3
with:
version: 9
standalone: ${{ runner.os == 'Windows' }}
- name: Install node-gyp
run: pnpm add --global node-gyp
shell: bash
- name: Reconfigure git to use HTTP authentication
run: >
git config --global url."https://github.com/".insteadOf
ssh://[email protected]/
- name: Authenticate with private NPM package
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
- name: Install modules.
run: yarn setup
run: pnpm run setup
- name: Checkout flathub repository.
run: git clone https://github.com/flathub/xyz.hyperplay.HyperPlay.git
- name: Update flathub release
run: export RELEASE_VERSION=${{ github.ref_name }} && yarn release:updateFlathub:ci
run: export RELEASE_VERSION=${{ github.ref_name }} && pnpm release:updateFlathub:ci
- name: Branch flathub repo
run: git checkout -b "${{ github.ref_name }}"
working-directory: ./xyz.hyperplay.HyperPlay
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/release_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,27 @@ jobs:
uses: actions/checkout@v4

- name: Setup NodeJS
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'yarn'
- uses: pnpm/action-setup@v3
with:
version: 9
standalone: ${{ runner.os == 'Windows' }}
- name: Install node-gyp
run: pnpm add --global node-gyp
shell: bash
- name: Reconfigure git to use HTTP authentication
run: >
git config --global url."https://github.com/".insteadOf
ssh://[email protected]/
- name: Authenticate with private NPM package
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
- name: Install modules.
run: yarn setup
run: pnpm run setup
- name: setup env production file
run: |
echo "VITE_LD_ENVIRONMENT_ID=${{ secrets.VITE_LD_ENVIRONMENT_ID }}" > .env.production
echo "VITE_IPFS_API=${{ secrets.VITE_IPFS_API }}" >> .env.production
- name: Build artifacts.
run: yarn run release:linux
run: pnpm run release:linux
Loading

0 comments on commit cbf6605

Please sign in to comment.