Mirrors/super-productivity
1
0
Fork 0
mirror of https://github.com/johannesjo/super-productivity.git synced 2026-07-17 16:37:43 +00:00
Code Issues Projects Releases Wiki Activity

build: fix ?

Browse source
This commit is contained in:
Johannes Millan 2025-08-08 20:42:32 +02:00
parent ab5204b84d
commit 7c00dcc8ba
8 changed files with 42 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/build-android.yml vendored
View file

@ -10,6 +10,9 @@ on:
jobs:
build-android:
runs-on: ubuntu-latest
env:
UNSPLASH_KEY: ${{ secrets.UNSPLASH_KEY }}
UNSPLASH_CLIENT_ID: ${{ secrets.UNSPLASH_CLIENT_ID }}
steps:
- name: Checkout sources
uses: actions/checkout@v4

6
.github/workflows/build-create-windows-store-on-release.yml vendored
View file

@ -12,6 +12,9 @@ on:
jobs:
windows-store-artifact:
runs-on: windows-latest
env:
UNSPLASH_KEY: ${{ secrets.UNSPLASH_KEY }}
UNSPLASH_CLIENT_ID: ${{ secrets.UNSPLASH_CLIENT_ID }}
if: '!github.event.release.prerelease'
@ -60,9 +63,6 @@ jobs:
# if: steps.npm-cache.outputs.cache-hit != 'true'
run: npm i
- name: Generate env.generated.ts
run: node ./tools/load-env.js
- name: Lint
run: npm run lint:ci

6
.github/workflows/build-publish-to-mac-store-on-release.yml vendored
View file

@ -8,6 +8,9 @@ on:
jobs:
mac-store-release:
runs-on: macos-latest
env:
UNSPLASH_KEY: ${{ secrets.UNSPLASH_KEY }}
UNSPLASH_CLIENT_ID: ${{ secrets.UNSPLASH_CLIENT_ID }}
if: '!github.event.release.prerelease'
@ -49,9 +52,6 @@ jobs:
env:
PROVISION_PROFILE: ${{secrets.mas_provision_profile}}
- name: Generate env.generated.ts
run: node ./tools/load-env.js
- name: Lint
run: npm run lint:ci

7
.github/workflows/build-update-web-app-on-release.yml vendored
View file

@ -8,8 +8,10 @@ on:
jobs:
upload-to-app-super-productivity:
runs-on: ubuntu-latest
if: '!github.event.release.prerelease'
env:
UNSPLASH_KEY: ${{ secrets.UNSPLASH_KEY }}
UNSPLASH_CLIENT_ID: ${{ secrets.UNSPLASH_CLIENT_ID }}
steps:
- uses: actions/setup-node@v3
@ -46,9 +48,6 @@ jobs:
# if: steps.npm-cache.outputs.cache-hit != 'true'
run: npm i
- name: Generate env.generated.ts
run: node ./tools/load-env.js
- name: Lint
run: npm run lint:ci

26
.github/workflows/build.yml vendored
View file

@ -10,6 +10,8 @@ jobs:
runs-on: ubuntu-latest
env:
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}
UNSPLASH_KEY: ${{ secrets.UNSPLASH_KEY }}
UNSPLASH_CLIENT_ID: ${{ secrets.UNSPLASH_CLIENT_ID }}
steps:
- uses: actions/setup-node@v3
@ -46,12 +48,6 @@ jobs:
npx playwright install --with-deps chromium
npx playwright install-deps chromium
- name: Generate env.generated.ts
run: node ./tools/load-env.js
env:
UNSPLASH_KEY: ${{ secrets.UNSPLASH_KEY }}
UNSPLASH_CLIENT_ID: ${{ secrets.UNSPLASH_CLIENT_ID }}
- name: Lint
run: npm run lint:ci
@ -100,6 +96,9 @@ jobs:
mac-bin:
runs-on: macos-latest
if: startsWith(github.ref, 'refs/tags/v')
env:
UNSPLASH_KEY: ${{ secrets.UNSPLASH_KEY }}
UNSPLASH_CLIENT_ID: ${{ secrets.UNSPLASH_CLIENT_ID }}
steps:
- uses: actions/setup-node@v3
@ -150,12 +149,6 @@ jobs:
mkdir -p ~/private_keys/
echo '${{ secrets.mac_api_key }}' > ~/private_keys/AuthKey_${{ secrets.mac_api_key_id }}.p8
- name: Generate env.generated.ts
run: node ./tools/load-env.js
env:
UNSPLASH_KEY: ${{ secrets.UNSPLASH_KEY }}
UNSPLASH_CLIENT_ID: ${{ secrets.UNSPLASH_CLIENT_ID }}
- name: Lint
run: npm run lint:ci
@ -193,6 +186,9 @@ jobs:
windows-bin:
runs-on: windows-latest
if: startsWith(github.ref, 'refs/tags/v')
env:
UNSPLASH_KEY: ${{ secrets.UNSPLASH_KEY }}
UNSPLASH_CLIENT_ID: ${{ secrets.UNSPLASH_CLIENT_ID }}
steps:
- uses: actions/setup-node@v3
@ -233,12 +229,6 @@ jobs:
# if: steps.npm-cache.outputs.cache-hit != 'true'
run: npm i
- name: Generate env.generated.ts
run: node ./tools/load-env.js
env:
UNSPLASH_KEY: ${{ secrets.UNSPLASH_KEY }}
UNSPLASH_CLIENT_ID: ${{ secrets.UNSPLASH_CLIENT_ID }}
- name: Lint
run: npm run lint:ci

9
.github/workflows/lint-and-test-pr.yml vendored
View file

@ -8,6 +8,9 @@ permissions:
jobs:
test-on-linux:
runs-on: ubuntu-latest
env:
UNSPLASH_KEY: ${{ secrets.UNSPLASH_KEY }}
UNSPLASH_CLIENT_ID: ${{ secrets.UNSPLASH_CLIENT_ID }}
steps:
- uses: actions/setup-node@v3
with:
@ -43,12 +46,6 @@ jobs:
npx playwright install --with-deps chromium
npx playwright install-deps chromium
- name: Generate env.generated.ts
run: node ./tools/load-env.js
env:
UNSPLASH_KEY: ${{ secrets.UNSPLASH_KEY }}
UNSPLASH_CLIENT_ID: ${{ secrets.UNSPLASH_CLIENT_ID }}
- run: npm run lint:ci
- run: npm run test
- run: npm run e2e

9
.github/workflows/manual-build.yml vendored
View file

@ -10,6 +10,9 @@ on:
jobs:
windows-bin:
runs-on: windows-latest
env:
UNSPLASH_KEY: ${{ secrets.UNSPLASH_KEY }}
UNSPLASH_CLIENT_ID: ${{ secrets.UNSPLASH_CLIENT_ID }}
steps:
- uses: actions/setup-node@v3
@ -62,6 +65,9 @@ jobs:
mac-bin:
runs-on: macos-latest
env:
UNSPLASH_KEY: ${{ secrets.UNSPLASH_KEY }}
UNSPLASH_CLIENT_ID: ${{ secrets.UNSPLASH_CLIENT_ID }}
steps:
- uses: actions/setup-node@v3
@ -112,9 +118,6 @@ jobs:
mkdir -p ~/private_keys/
echo '${{ secrets.mac_api_key }}' > ~/private_keys/AuthKey_${{ secrets.mac_api_key_id }}.p8
- name: Generate env.generated.ts
run: node ./tools/load-env.js
- name: Lint
run: npm run lint:ci

25
package.json
View file

@ -24,19 +24,20 @@
},
"main": "./electron/main.js",
"scripts": {
"env": "node ./tools/load-env.js",
"assemble:android:prod": "cd android && ./gradlew assembleRelease && cd ..",
"assemble:android:stage": "cd android && ./gradlew assembleDebug && cd ..",
"prebuild": "node ./tools/git-version.js && npm run build:packages",
"prebuild": "npm run env && node ./tools/git-version.js && npm run build:packages",
"build": "npm run buildAllElectron:noTests:prod",
"build:packages": "node ./packages/build-packages.js",
"buildAllElectron:noTests:prod": "npm run lint && npm run buildFrontend:prod:es6 && npm run electron:build",
"buildAllElectron:prod": "npm run preCheck && npm run buildFrontend:prod:es6 && npm run electron:build",
"buildAllElectron:prod": "npm run env && npm run preCheck && npm run buildFrontend:prod:es6 && npm run electron:build",
"buildAllElectron:stage": "npm run preCheck && npm run buildFrontend:stage:es6 && npm run electron:build",
"buildFrontend:prod:es6": "npm run prebuild && node tools/load-env.js cross-env BROWSERSLIST_ENV='modern' ng build --configuration production && npm run removeWOFF1",
"buildFrontend:prod:es6": "npm run prebuild && cross-env BROWSERSLIST_ENV='modern' ng build --configuration production && npm run removeWOFF1",
"buildFrontend:prod:watch": "npm run prebuild && ng build --configuration production --watch",
"buildFrontend:prodWeb": "npm run prebuild && node tools/load-env.js ng build --configuration productionWeb",
"buildFrontend:stage:es6": "npm run prebuild && node tools/load-env.js cross-env BROWSERSLIST_ENV='modern' ng build --configuration stage && npm run removeWOFF1",
"buildFrontend:stageWeb": "npm run prebuild && node tools/load-env.js ng build --configuration stageWeb",
"buildFrontend:prodWeb": "npm run prebuild && ng build --configuration productionWeb",
"buildFrontend:stage:es6": "npm run prebuild && cross-env BROWSERSLIST_ENV='modern' ng build --configuration stage && npm run removeWOFF1",
"buildFrontend:stageWeb": "npm run prebuild && ng build --configuration stageWeb",
"buildFrontend:stageWeb:unminified": "npm run prebuild && ng build --configuration stageWeb --optimization=false --aot=false",
"dist": "npm run buildAllElectron:prod && electron-builder",
"dist:android": "npm run buildFrontend:stageWeb:unminified && npm run sync:android && npm run assemble:android:stage && echo 'Staging Android APK generated at android/app/build/outputs/apk/debug/'",
@ -91,14 +92,14 @@
"removeWOFF1": "node ./tools/remove-woff.js",
"serveProd": "ng serve --configuration production",
"start": "npm run electron:build && cross-env NODE_ENV=DEV electron .",
"startFrontend": "node tools/load-env.js ng serve",
"startFrontend:e2e": "node tools/load-env.js ng serve --port=4242",
"startFrontend:prod": "node tools/load-env.js ng serve --configuration production",
"startFrontend:stage": "node tools/load-env.js ng serve --configuration stage",
"startFrontend": "npm run env && ng serve",
"startFrontend:e2e": "npm run env && ng serve --port=4242",
"startFrontend:prod": "npm run env && ng serve --configuration production",
"startFrontend:stage": "npm run env && ng serve --configuration stage",
"sync:android": "npx cap sync android",
"stats": "ng build --configuration production --source-map --stats-json && npx esbuild-visualizer --metadata .tmp/angular-dist/stats.json && xdg-open stats.html",
"test": "cross-env TZ='Europe/Berlin' ng test --watch=false && npm run test:tz:ci",
"test:once": "cross-env TZ='Europe/Berlin' ng test --watch=false",
"test": "npm run env && cross-env TZ='Europe/Berlin' ng test --watch=false && npm run test:tz:ci",
"test:once": "npm run env && cross-env TZ='Europe/Berlin' ng test --watch=false",
"test:watch": "cross-env TZ='Europe/Berlin' ng test --browsers ChromeHeadless",
"test:tz:ci": "npm run test:tz:la",
"test:tz:la": "cross-env TZ='America/Los_Angeles' ng test --watch=false --include='**/*.spec.ts'",