Skip to content

Commit

Permalink
Adjust rpath for libs
Browse files Browse the repository at this point in the history
  • Loading branch information
raub committed Jan 11, 2025
1 parent b09cc1a commit b681e56
Show file tree
Hide file tree
Showing 6 changed files with 183 additions and 173 deletions.
34 changes: 27 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,33 @@ jobs:

pack-qt:
machine:
image: ubuntu-2204:current
image: ubuntu-2404:current
resource_class: arm.medium
steps:
- run: python -m pip install setuptools aqtinstall
- run: cd ~ && python -m aqt install-qt --outputdir ~/Qt linux_arm64 desktop 6.8.0 linux_gcc_arm64
- restore_cache:
name: Restore Qt Cache
key: Qt-6.8.0-v3
- run: |
if [ -d "/home/circleci/Qt" ]; then
echo "Qt 6.8.0 already installed."
else
echo "Downloading Qt 6.8.0."
python3 -m pip install setuptools aqtinstall
cd ~
python3 -m aqt install-qt --outputdir ~/Qt linux_arm64 desktop 6.8.0 linux_gcc_arm64
fi
- save_cache:
name: Save Qt Cache
key: Qt-6.8.0-v3
paths:
- ../Qt

- checkout
- run: mkdir -p ~/artifacts
- run: node -p "require('./package').version" > ~/artifacts/pkg-version

- run: |
mkdir -p ~/artifacts
node -p "require('./package').version" > ~/artifacts/pkg-version
- run: chmod +x src/qt-mkdir.sh && src/qt-mkdir.sh ~/qt_tmp
- run: chmod +x src/qt-copy-linux.sh && src/qt-copy-linux.sh ~/qt_tmp ~/Qt/6.8.0/gcc_arm64
- run: cd ~/qt_tmp && tar -czf ../aarch64.gz *
Expand All @@ -34,10 +53,11 @@ jobs:

upload-qt:
docker:
- image: cibuilds/github:0.10
- image: cimg/go:1.23.1
steps:
- attach_workspace:
at: /tmp/artifacts
- run: go install github.com/tcnksm/ghr@latest
- run: |
PKG_VERSION=`cat /tmp/artifacts/pkg-version`
ghr -u "node-3d" -r "${CIRCLE_PROJECT_REPONAME}" -c "${CIRCLE_SHA1}" -replace ${PKG_VERSION} /tmp/artifacts/aarch64.gz
ghr -u "node-3d" -r "${CIRCLE_PROJECT_REPONAME}" -c "${CIRCLE_SHA1}" -n "Release ${PKG_VERSION}" -replace ${PKG_VERSION} /tmp/artifacts/aarch64.gz
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Luis Blanco
Copyright (c) 2025 Luis Blanco

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
92 changes: 1 addition & 91 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,93 +1,3 @@
'use strict';

const js = require('@eslint/js');


module.exports = [
js.configs.recommended,
{
languageOptions: {
'parserOptions': {
'ecmaVersion': 2022,
sourceType: 'commonjs'
},
globals: {
require: 'readonly',
Buffer: 'readonly',
module: 'readonly',
console: 'readonly',
__dirname: 'readonly',
process: 'readonly',
},
},
'rules': {
'arrow-parens': ['error', 'always'],
'no-trailing-spaces': [
'error',
{
'skipBlankLines': true
}
],
'indent': [
'error',
'tab',
{
'SwitchCase': 1
}
],
'operator-linebreak': [
'error',
'after',
{
'overrides': {
'?': 'before',
':': 'before'
}
}
],
'max-len': ['error', 110],
'quotes': [
'error',
'single'
],
'semi': [
'error',
'always'
],
'no-multiple-empty-lines': ['error', { 'max': 3, 'maxEOF': 1, 'maxBOF': 1 }],
'keyword-spacing': ['error', { 'before': true, 'after': true }],
'space-before-blocks': ['error'],
'space-before-function-paren': [
'error', {'anonymous': 'always', 'named': 'never', 'asyncArrow': 'always'}
],
'camelcase': ['error'],
'no-tabs': [0],
'no-unused-vars': [
'error',
{
'argsIgnorePattern': '^_',
'varsIgnorePattern': '^_',
'caughtErrorsIgnorePattern': '^_'
}
],
'global-require': [0],
'no-underscore-dangle': [0],
'no-plusplus': [0],
'no-shadow': [0],
'node/no-unpublished-require': [0],
'no-process-exit': [0],
'linebreak-style': [0],
'node/no-missing-require': [0],
'no-console': [0],
'node/no-unsupported-features/es-builtins': 0,
'node/no-unsupported-features/node-builtins': 0,
'func-names': [
'error',
'never',
{
'generators': 'never'
}
]
}
},
];
module.exports = require('addon-tools-raub/utils/eslint-common');
88 changes: 46 additions & 42 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@
"url": "https://github.com/node-3d/deps-qt-qml-raub.git"
},
"dependencies": {
"addon-tools-raub": "^9.0.0",
"addon-tools-raub": "^9.2.0",
"deps-qt-gui-raub": "^4.0.0"
},
"devDependencies": {
"@types/node": "^22.7.9",
"@eslint/js": "^9.13.0",
"eslint": "^9.13.0",
"node-addon-api": "^8.2.1",
"typescript": "^5.6.3"
"@types/node": "^22.10.5",
"@eslint/js": "^9.17.0",
"eslint": "^9.17.0",
"node-addon-api": "^8.3.0",
"typescript": "^5.7.2"
}
}
Loading

0 comments on commit b681e56

Please sign in to comment.