Skip to content

Commit b681e56

Browse files
committed
Adjust rpath for libs
1 parent b09cc1a commit b681e56

File tree

6 files changed

+183
-173
lines changed

6 files changed

+183
-173
lines changed

.circleci/config.yml

+27-7
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,33 @@ jobs:
1414

1515
pack-qt:
1616
machine:
17-
image: ubuntu-2204:current
17+
image: ubuntu-2404:current
1818
resource_class: arm.medium
1919
steps:
20-
- run: python -m pip install setuptools aqtinstall
21-
- run: cd ~ && python -m aqt install-qt --outputdir ~/Qt linux_arm64 desktop 6.8.0 linux_gcc_arm64
20+
- restore_cache:
21+
name: Restore Qt Cache
22+
key: Qt-6.8.0-v3
23+
- run: |
24+
if [ -d "/home/circleci/Qt" ]; then
25+
echo "Qt 6.8.0 already installed."
26+
else
27+
echo "Downloading Qt 6.8.0."
28+
python3 -m pip install setuptools aqtinstall
29+
cd ~
30+
python3 -m aqt install-qt --outputdir ~/Qt linux_arm64 desktop 6.8.0 linux_gcc_arm64
31+
fi
32+
- save_cache:
33+
name: Save Qt Cache
34+
key: Qt-6.8.0-v3
35+
paths:
36+
- ../Qt
37+
2238
- checkout
23-
- run: mkdir -p ~/artifacts
24-
- run: node -p "require('./package').version" > ~/artifacts/pkg-version
39+
40+
- run: |
41+
mkdir -p ~/artifacts
42+
node -p "require('./package').version" > ~/artifacts/pkg-version
43+
2544
- run: chmod +x src/qt-mkdir.sh && src/qt-mkdir.sh ~/qt_tmp
2645
- run: chmod +x src/qt-copy-linux.sh && src/qt-copy-linux.sh ~/qt_tmp ~/Qt/6.8.0/gcc_arm64
2746
- run: cd ~/qt_tmp && tar -czf ../aarch64.gz *
@@ -34,10 +53,11 @@ jobs:
3453

3554
upload-qt:
3655
docker:
37-
- image: cibuilds/github:0.10
56+
- image: cimg/go:1.23.1
3857
steps:
3958
- attach_workspace:
4059
at: /tmp/artifacts
60+
- run: go install github.com/tcnksm/ghr@latest
4161
- run: |
4262
PKG_VERSION=`cat /tmp/artifacts/pkg-version`
43-
ghr -u "node-3d" -r "${CIRCLE_PROJECT_REPONAME}" -c "${CIRCLE_SHA1}" -replace ${PKG_VERSION} /tmp/artifacts/aarch64.gz
63+
ghr -u "node-3d" -r "${CIRCLE_PROJECT_REPONAME}" -c "${CIRCLE_SHA1}" -n "Release ${PKG_VERSION}" -replace ${PKG_VERSION} /tmp/artifacts/aarch64.gz

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2023 Luis Blanco
3+
Copyright (c) 2025 Luis Blanco
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

eslint.config.js

+1-91
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,3 @@
11
'use strict';
22

3-
const js = require('@eslint/js');
4-
5-
6-
module.exports = [
7-
js.configs.recommended,
8-
{
9-
languageOptions: {
10-
'parserOptions': {
11-
'ecmaVersion': 2022,
12-
sourceType: 'commonjs'
13-
},
14-
globals: {
15-
require: 'readonly',
16-
Buffer: 'readonly',
17-
module: 'readonly',
18-
console: 'readonly',
19-
__dirname: 'readonly',
20-
process: 'readonly',
21-
},
22-
},
23-
'rules': {
24-
'arrow-parens': ['error', 'always'],
25-
'no-trailing-spaces': [
26-
'error',
27-
{
28-
'skipBlankLines': true
29-
}
30-
],
31-
'indent': [
32-
'error',
33-
'tab',
34-
{
35-
'SwitchCase': 1
36-
}
37-
],
38-
'operator-linebreak': [
39-
'error',
40-
'after',
41-
{
42-
'overrides': {
43-
'?': 'before',
44-
':': 'before'
45-
}
46-
}
47-
],
48-
'max-len': ['error', 110],
49-
'quotes': [
50-
'error',
51-
'single'
52-
],
53-
'semi': [
54-
'error',
55-
'always'
56-
],
57-
'no-multiple-empty-lines': ['error', { 'max': 3, 'maxEOF': 1, 'maxBOF': 1 }],
58-
'keyword-spacing': ['error', { 'before': true, 'after': true }],
59-
'space-before-blocks': ['error'],
60-
'space-before-function-paren': [
61-
'error', {'anonymous': 'always', 'named': 'never', 'asyncArrow': 'always'}
62-
],
63-
'camelcase': ['error'],
64-
'no-tabs': [0],
65-
'no-unused-vars': [
66-
'error',
67-
{
68-
'argsIgnorePattern': '^_',
69-
'varsIgnorePattern': '^_',
70-
'caughtErrorsIgnorePattern': '^_'
71-
}
72-
],
73-
'global-require': [0],
74-
'no-underscore-dangle': [0],
75-
'no-plusplus': [0],
76-
'no-shadow': [0],
77-
'node/no-unpublished-require': [0],
78-
'no-process-exit': [0],
79-
'linebreak-style': [0],
80-
'node/no-missing-require': [0],
81-
'no-console': [0],
82-
'node/no-unsupported-features/es-builtins': 0,
83-
'node/no-unsupported-features/node-builtins': 0,
84-
'func-names': [
85-
'error',
86-
'never',
87-
{
88-
'generators': 'never'
89-
}
90-
]
91-
}
92-
},
93-
];
3+
module.exports = require('addon-tools-raub/utils/eslint-common');

package-lock.json

+46-42
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@
4646
"url": "https://github.com/node-3d/deps-qt-qml-raub.git"
4747
},
4848
"dependencies": {
49-
"addon-tools-raub": "^9.0.0",
49+
"addon-tools-raub": "^9.2.0",
5050
"deps-qt-gui-raub": "^4.0.0"
5151
},
5252
"devDependencies": {
53-
"@types/node": "^22.7.9",
54-
"@eslint/js": "^9.13.0",
55-
"eslint": "^9.13.0",
56-
"node-addon-api": "^8.2.1",
57-
"typescript": "^5.6.3"
53+
"@types/node": "^22.10.5",
54+
"@eslint/js": "^9.17.0",
55+
"eslint": "^9.17.0",
56+
"node-addon-api": "^8.3.0",
57+
"typescript": "^5.7.2"
5858
}
5959
}

0 commit comments

Comments
 (0)