forked from laurent22/joplin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/release-2.10' into electron_fr…
…eebsd
- Loading branch information
Showing
991 changed files
with
59,419 additions
and
40,987 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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 |
---|---|---|
@@ -0,0 +1,44 @@ | ||
# The goal of this action is to compile the Android debug build. That should | ||
# tell us automatically if something got broken when a dependency was changed. | ||
|
||
name: react-native-android-build-apk | ||
on: [push, pull_request] | ||
|
||
jobs: | ||
pre_job: | ||
runs-on: ubuntu-latest | ||
outputs: | ||
should_skip: ${{ steps.skip_check.outputs.should_skip }} | ||
steps: | ||
- id: skip_check | ||
uses: fkirc/skip-duplicate-actions@v5 | ||
with: | ||
concurrent_skipping: 'same_content_newer' | ||
|
||
BuildAndroidDebug: | ||
needs: pre_job | ||
if: needs.pre_job.outputs.should_skip != 'true' | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Install Linux dependencies | ||
run: | | ||
sudo apt-get update || true | ||
sudo apt-get install -y libsecret-1-dev | ||
- uses: actions/setup-node@v2 | ||
with: | ||
node-version: '18' | ||
|
||
- name: Install Yarn | ||
run: | | ||
corepack enable | ||
- uses: actions/checkout@v2 | ||
|
||
- name: Install | ||
run: yarn install | ||
|
||
- name: Build Android Release | ||
run: | | ||
cd packages/app-mobile/android && ./gradlew assembleDebug | ||
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 |
---|---|---|
@@ -0,0 +1,36 @@ | ||
name: "CLA Assistant" | ||
on: | ||
issue_comment: | ||
types: [created] | ||
pull_request_target: | ||
types: [opened,closed,synchronize] | ||
|
||
jobs: | ||
CLAAssistant: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: "CLA Assistant" | ||
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' | ||
# Beta Release | ||
uses: contributor-assistant/[email protected] | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
# the below token should have repo scope and must be manually added by you in the repository's secret | ||
PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} | ||
with: | ||
path-to-signatures: 'readme/cla_signatures.json' | ||
path-to-document: 'https://github.com/laurent22/joplin/blob/dev/readme/cla.md' # e.g. a CLA or a DCO document | ||
# branch should not be protected | ||
branch: 'dev' | ||
allowlist: joplinbot,renovate[bot] | ||
|
||
# the followings are the optional inputs - If the optional inputs are not given, then default values will be taken | ||
#remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository) | ||
#remote-repository-name: enter the remote repository name where the signatures should be stored (Default is storing the signatures in the same repository) | ||
#create-file-commit-message: 'For example: Creating file for storing CLA Signatures' | ||
#signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo' | ||
#custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign' | ||
#custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA' | ||
#custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.' | ||
#lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true) | ||
#use-dco-flag: true - If you are using DCO instead of CLA |
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 |
---|---|---|
@@ -1,13 +1,42 @@ | ||
name: Joplin Continuous Integration | ||
on: [push, pull_request] | ||
jobs: | ||
pre_job: | ||
runs-on: ubuntu-latest | ||
outputs: | ||
should_skip: ${{ steps.skip_check.outputs.should_skip }} | ||
steps: | ||
- id: skip_check | ||
uses: fkirc/skip-duplicate-actions@v5 | ||
with: | ||
concurrent_skipping: 'same_content_newer' | ||
|
||
Main: | ||
needs: pre_job | ||
# We always process server or desktop release tags, because they also publish the release | ||
if: needs.pre_job.outputs.should_skip != 'true' || startsWith(github.ref, 'refs/tags/server-v') || startsWith(github.ref, 'refs/tags/v') | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
matrix: | ||
os: [macos-latest, ubuntu-latest, windows-2019] | ||
steps: | ||
|
||
# Trying to fix random networking issues on Windows | ||
# https://github.com/actions/runner-images/issues/1187#issuecomment-686735760 | ||
- name: Disable TCP/UDP offload on Windows | ||
if: runner.os == 'Windows' | ||
run: Disable-NetAdapterChecksumOffload -Name * -TcpIPv4 -UdpIPv4 -TcpIPv6 -UdpIPv6 | ||
|
||
- name: Disable TCP/UDP offload on Linux | ||
if: runner.os == 'Linux' | ||
run: sudo ethtool -K eth0 tx off rx off | ||
|
||
- name: Disable TCP/UDP offload on macOS | ||
if: runner.os == 'macOS' | ||
run: | | ||
sudo sysctl -w net.link.generic.system.hwcksum_tx=0 | ||
sudo sysctl -w net.link.generic.system.hwcksum_rx=0 | ||
# Silence apt-get update errors (for example when a module doesn't | ||
# exist) since otherwise it will make the whole build fails, even though | ||
# it might work without update. libsecret-1-dev is required for keytar - | ||
|
@@ -41,7 +70,7 @@ jobs: | |
- uses: olegtarasov/[email protected] | ||
- uses: actions/setup-node@v2 | ||
with: | ||
node-version: '16' | ||
node-version: '18' | ||
|
||
- name: Install Yarn | ||
run: | | ||
|
@@ -51,7 +80,7 @@ jobs: | |
# Login to Docker only if we're on a server release tag. If we run this on | ||
# a pull request it will fail because the PR doesn't have access to | ||
# secrets | ||
- uses: docker/login-action@v1 | ||
- uses: docker/login-action@v2 | ||
if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v') | ||
with: | ||
username: ${{ secrets.DOCKERHUB_USERNAME }} | ||
|
@@ -99,6 +128,8 @@ jobs: | |
yarn install && cd packages/app-desktop && yarn run dist --publish=never | ||
ServerDockerImage: | ||
needs: pre_job | ||
if: needs.pre_job.outputs.should_skip != 'true' | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
matrix: | ||
|
@@ -123,7 +154,7 @@ jobs: | |
|
||
- uses: actions/setup-node@v2 | ||
with: | ||
node-version: '16' | ||
node-version: '18' | ||
|
||
- name: Install Yarn | ||
run: | | ||
|
@@ -136,4 +167,7 @@ jobs: | |
run: | | ||
yarn install | ||
yarn run buildServerDocker --tag-name server-v0.0.0 --repository joplin/server | ||
# Basic test to ensure that the created build is valid. It should exit with | ||
# code 0 if it works. | ||
docker run joplin/server:0.0.0-beta node dist/app.js migrate list |
Oops, something went wrong.