Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-15 12:25:15 +03:00
Code Issues Wiki Activity

Fix-freezing

Browse source 
Bump ubuntu version in workflow
This commit is contained in:
Mark Haslinghuis 2022-05-03 02:52:44 +02:00
parent af0f2aa444
commit 2cb90b13a3
9 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/artifact-links.yml vendored
View file

@ -7,7 +7,7 @@ on:
jobs: jobs:
artifacts-url-comments: artifacts-url-comments:
name: Add artifact links to PR and issues name: Add artifact links to PR and issues
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Add artifact links to PR and issues - name: Add artifact links to PR and issues
uses: tonyhallett/artifacts-url-comments@v1.1.0 uses: tonyhallett/artifacts-url-comments@v1.1.0

2
.github/workflows/build-release.yml vendored
View file

@ -16,7 +16,7 @@ jobs:
release: release:
name: Attach Release Artifacts name: Attach Release Artifacts
needs: ci needs: ci
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Code Checkout - name: Code Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2

2
.github/workflows/hide-artifact-links.yml vendored
View file

@ -7,7 +7,7 @@ on:
jobs: jobs:
hide-artifacts-link-comments: hide-artifacts-link-comments:
name: Hide artifact links name: Hide artifact links
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Hide comments - name: Hide comments
uses: int128/hide-comment-action@v1 uses: int128/hide-comment-action@v1

2
.github/workflows/nightly.yml vendored
View file

@ -30,7 +30,7 @@ jobs:
release: release:
name: Nightly release name: Nightly release
needs: ci needs: ci
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Fetch build artifacts - name: Fetch build artifacts
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2

2
.github/workflows/release.yml vendored
View file

@ -31,7 +31,7 @@ jobs:
release: release:
name: Release name: Release
needs: ci needs: ci
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Fetch build artifacts - name: Fetch build artifacts
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2

2
.nvmrc
View file

@ -1 +1 @@
14.18.2 16.15.0

2
gulpfile.js
View file

@ -48,7 +48,7 @@ const NODE_ENV = process.env.NODE_ENV || 'production';
const NAME_REGEX = /-/g; const NAME_REGEX = /-/g;
const nwBuilderOptions = { const nwBuilderOptions = {
version: os.platform() === 'linux' ? '0.54.1' : '0.60.0', // linux has a bug with moving OSD elements version: '0.62.0',
files: `${DIST_DIR}**/*`, files: `${DIST_DIR}**/*`,
macIcns: './src/images/bf_icon.icns', macIcns: './src/images/bf_icon.icns',
macPlist: { 'CFBundleDisplayName': 'Betaflight Configurator'}, macPlist: { 'CFBundleDisplayName': 'Betaflight Configurator'},

2
package.json
View file

@ -48,7 +48,7 @@
"author": "The Betaflight open source project.", "author": "The Betaflight open source project.",
"license": "GPL-3.0", "license": "GPL-3.0",
"engines": { "engines": {
"node": "14.x" "node": "16.x"
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^5.13.0", "@fortawesome/fontawesome-free": "^5.13.0",

6
src/js/tabs/osd.js
View file

@ -2352,7 +2352,11 @@ OSD.GUI.preview = {
ev.dataTransfer.setData("text/plain", $(ev.target).data('field').index); ev.dataTransfer.setData("text/plain", $(ev.target).data('field').index);
ev.dataTransfer.setData("x", ev.currentTarget.dataset.x); ev.dataTransfer.setData("x", ev.currentTarget.dataset.x);
ev.dataTransfer.setData("y", ev.currentTarget.dataset.y); ev.dataTransfer.setData("y", ev.currentTarget.dataset.y);
ev.dataTransfer.setDragImage($(this).data('field').preview_img, offsetX, offsetY);
if (GUI.operating_system !== "Linux") {
// latest NW.js (0.6x.x) has introduced an issue with Linux displaying a rectangle while moving an element
ev.dataTransfer.setDragImage($(this).data('field').preview_img, offsetX, offsetY);
}
}, },
onDragOver(e) { onDragOver(e) {
const ev = e.originalEvent; const ev = e.originalEvent;