You've already forked joplin
mirror of
https://github.com/laurent22/joplin.git
synced 2025-08-10 22:11:50 +02:00
Merge branch 'dev' into renovate/bat-0.x
This commit is contained in:
@@ -5,10 +5,10 @@ runs:
|
||||
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'
|
||||
shell: pwsh
|
||||
run: Disable-NetAdapterChecksumOffload -Name * -TcpIPv4 -UdpIPv4 -TcpIPv6 -UdpIPv6
|
||||
# - name: Disable TCP/UDP offload on Windows
|
||||
# if: runner.os == 'Windows'
|
||||
# shell: pwsh
|
||||
# run: Disable-NetAdapterChecksumOffload -Name * -TcpIPv4 -UdpIPv4 -TcpIPv6 -UdpIPv6
|
||||
|
||||
- name: Disable TCP/UDP offload on Linux
|
||||
if: runner.os == 'Linux'
|
||||
@@ -49,6 +49,7 @@ runs:
|
||||
|
||||
- uses: olegtarasov/get-tag@v2.1.4
|
||||
- uses: dtolnay/rust-toolchain@stable
|
||||
if: ${{ runner.os != 'Windows' }}
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '18.18.0'
|
||||
|
5
.github/workflows/ui-tests.yml
vendored
5
.github/workflows/ui-tests.yml
vendored
@@ -16,6 +16,11 @@ jobs:
|
||||
uses: ./.github/workflows/shared/setup-build-environment
|
||||
- name: Build
|
||||
run: yarn install
|
||||
env:
|
||||
# The onenote-converter package uses Rust, which isn't installed on all CI
|
||||
# runners. Since the onenote-converter doesn't have UI tests, it can be excluded
|
||||
# from build:
|
||||
SKIP_ONENOTE_CONVERTER_BUILD: 1
|
||||
- name: Run UI tests
|
||||
shell: bash
|
||||
run: |
|
||||
|
@@ -28,7 +28,7 @@
|
||||
"@joplin/react-native-saf-x": "~3.4",
|
||||
"@joplin/renderer": "~3.4",
|
||||
"@joplin/utils": "~3.4",
|
||||
"@react-native-clipboard/clipboard": "1.16.1",
|
||||
"@react-native-clipboard/clipboard": "1.16.2",
|
||||
"@react-native-community/datetimepicker": "8.3.0",
|
||||
"@react-native-community/geolocation": "3.3.0",
|
||||
"@react-native-community/netinfo": "11.4.1",
|
||||
|
@@ -13,6 +13,13 @@ async function main() {
|
||||
return;
|
||||
}
|
||||
|
||||
// Sometimes the onenote-converter build needs to be disabled in CI.
|
||||
if (process.env.SKIP_ONENOTE_CONVERTER_BUILD) {
|
||||
// eslint-disable-next-line no-console
|
||||
console.info('SKIP_ONENOTE_CONVERTER_BUILD was set. The onenote-converter package will not be built.');
|
||||
return;
|
||||
}
|
||||
|
||||
const argv = yargs.argv;
|
||||
if (!argv.profile) throw new Error('OneNote build: profile value is missing');
|
||||
if (!['release', 'dev'].includes(argv.profile)) throw new Error('OneNote build: profile value is invalid');
|
||||
|
10
yarn.lock
10
yarn.lock
@@ -8923,7 +8923,7 @@ __metadata:
|
||||
"@joplin/utils": "npm:~3.4"
|
||||
"@js-draw/material-icons": "npm:1.30.0"
|
||||
"@pmmmwh/react-refresh-webpack-plugin": "npm:^0.5.15"
|
||||
"@react-native-clipboard/clipboard": "npm:1.16.1"
|
||||
"@react-native-clipboard/clipboard": "npm:1.16.2"
|
||||
"@react-native-community/cli": "npm:15.0.1"
|
||||
"@react-native-community/cli-platform-android": "npm:15.1.3"
|
||||
"@react-native-community/cli-platform-ios": "npm:15.0.1"
|
||||
@@ -11407,9 +11407,9 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@react-native-clipboard/clipboard@npm:1.16.1":
|
||||
version: 1.16.1
|
||||
resolution: "@react-native-clipboard/clipboard@npm:1.16.1"
|
||||
"@react-native-clipboard/clipboard@npm:1.16.2":
|
||||
version: 1.16.2
|
||||
resolution: "@react-native-clipboard/clipboard@npm:1.16.2"
|
||||
peerDependencies:
|
||||
react: ">= 16.9.0"
|
||||
react-native: ">= 0.61.5"
|
||||
@@ -11420,7 +11420,7 @@ __metadata:
|
||||
optional: true
|
||||
react-native-windows:
|
||||
optional: true
|
||||
checksum: 10/304371bd6e19de2e7b06280d1d8b0d38653cc387775dfa2d371edf0c60f831de70648188b51f1c87dc6409b728be33efce20e51f9ef405b5e87d8ad4140610f3
|
||||
checksum: 10/c556ed2f539c524aafd8fdfa34b03136185dc75fcb1e98bd2ca319adde852aa5f4b5e4c8998a1b0297c3ba36c1e98c1036930adc56792ba36073a71add9af1fa
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
Reference in New Issue
Block a user