-
-
Notifications
You must be signed in to change notification settings - Fork 999
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'johannesjo:master' into master
- Loading branch information
Showing
641 changed files
with
37,678 additions
and
49,190 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,65 +8,72 @@ on: | |
| jobs: | ||
| snap-release: | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }} | ||
|
|
||
| if: '!github.event.release.prerelease' | ||
|
|
||
| steps: | ||
| - uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: 20 | ||
| - name: Check out Git repository | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| persist-credentials: false | ||
| # work around for npm installs from git+https://github.com/johannesjo/J2M.git | ||
| - name: Reconfigure git to use HTTP authentication | ||
| run: > | ||
| git config --global url."https://github.com/".insteadOf | ||
| ssh://[email protected]/ | ||
| - name: Get npm cache directory | ||
| id: npm-cache-dir | ||
| run: | | ||
| echo "::set-output name=dir::$(npm config get cache)" | ||
| - uses: actions/cache@v4 | ||
| id: npm-cache # use this to check for `cache-hit` ==> if: steps.npm-cache.outputs.cache-hit != 'true' | ||
| with: | ||
| path: ${{ steps.npm-cache-dir.outputs.dir }} | ||
| key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-node- | ||
| - name: Install npm Packages | ||
| # if: steps.npm-cache.outputs.cache-hit != 'true' | ||
| run: npm i | ||
|
|
||
| - name: Lint | ||
| run: npm run lint | ||
|
|
||
| - name: Test Unit | ||
| run: npm run test | ||
|
|
||
| - name: Test E2E | ||
| run: npm run e2e | ||
|
|
||
| - name: Build Frontend & Electron | ||
| run: npm run build | ||
|
|
||
| - name: Install Snapcraft | ||
| uses: samuelmeuli/action-snapcraft@v2 | ||
| env: | ||
| SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }} | ||
|
|
||
| - name: Build/Release Electron app | ||
| uses: johannesjo/action-electron-builder@v1 | ||
| with: | ||
| build_script_name: empty | ||
| github_token: ${{ secrets.github_token }} | ||
| release: ${{ startsWith(github.ref, 'refs/tags/v') }} | ||
| env: | ||
| SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }} | ||
|
|
||
| - run: snapcraft push app-builds/superProductivity*.snap --release stable | ||
| env: | ||
| SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }} | ||
| - run: yes | snapcraft promote superproductivity --from-channel latest/edge --to-channel latest/stable | ||
| env: # Workaround for https://github.com/snapcore/snapcraft/issues/4439 | ||
| SNAPCRAFT_HAS_TTY: 'true' | ||
| # - uses: actions/setup-node@v3 | ||
| # with: | ||
| # node-version: 20 | ||
| # - name: Check out Git repository | ||
| # uses: actions/checkout@v4 | ||
| # with: | ||
| # persist-credentials: false | ||
| # # work around for npm installs from git+https://github.com/johannesjo/J2M.git | ||
| # - name: Reconfigure git to use HTTP authentication | ||
| # run: > | ||
| # git config --global url."https://github.com/".insteadOf | ||
| # ssh://[email protected]/ | ||
| # | ||
| # - name: Get npm cache directory | ||
| # id: npm-cache-dir | ||
| # run: | | ||
| # echo "::set-output name=dir::$(npm config get cache)" | ||
| # - uses: actions/cache@v4 | ||
| # id: npm-cache # use this to check for `cache-hit` ==> if: steps.npm-cache.outputs.cache-hit != 'true' | ||
| # with: | ||
| # path: ${{ steps.npm-cache-dir.outputs.dir }} | ||
| # key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} | ||
| # restore-keys: | | ||
| # ${{ runner.os }}-node- | ||
| # | ||
| # - name: Install npm Packages | ||
| # # if: steps.npm-cache.outputs.cache-hit != 'true' | ||
| # run: npm i | ||
| # | ||
| # - name: Lint | ||
| # run: npm run lint | ||
| # | ||
| # - name: Test Unit | ||
| # run: npm run test | ||
| # | ||
| # - name: Test E2E | ||
| # run: npm run e2e | ||
| # | ||
| # - name: Build Frontend & Electron | ||
| # run: npm run build | ||
| # | ||
| # - name: Install Snapcraft | ||
| # uses: samuelmeuli/action-snapcraft@v2 | ||
| # env: | ||
| # SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }} | ||
| # | ||
| # - name: Build/Release Electron app | ||
| # uses: johannesjo/action-electron-builder@v1 | ||
| # with: | ||
| # build_script_name: empty | ||
| # github_token: ${{ secrets.github_token }} | ||
| # release: ${{ startsWith(github.ref, 'refs/tags/v') }} | ||
| # env: | ||
| # SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }} | ||
| # | ||
| # - run: snapcraft push app-builds/superProductivity*.snap --release stable | ||
| # env: | ||
| # SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ | |
| /app-builds | ||
| /tmp | ||
| /out-tsc | ||
| /logs | ||
|
|
||
| # dependencies | ||
| /node_modules | ||
|
|
||
Oops, something went wrong.