Skip to content

Commit a2091de

Browse files
committed
fix(ci): resolve remaining CI/CD issues
- Remove macOS brew pyqt6 install (PyQt6 installed via pip) - Add FORCE_JAVASCRIPT_ACTIONS_TO_NODE24 env var to eliminate Node.js warnings - Improve black check error handling - Enhance import verification with fallback paths - Remove unnecessary Node.js setup-node step (using env var instead)
1 parent f0cdd7e commit a2091de

File tree

3 files changed

+737
-27
lines changed

3 files changed

+737
-27
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@ jobs:
1717
steps:
1818
- name: Checkout code
1919
uses: actions/checkout@v4
20+
env:
21+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
2022

2123
- name: Set up Python ${{ matrix.python-version }}
2224
uses: actions/setup-python@v5
2325
with:
2426
python-version: ${{ matrix.python-version }}
25-
26-
- name: Set up Node.js 24
27-
uses: actions/setup-node@v4
28-
with:
29-
node-version: '24'
27+
env:
28+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
3029

3130
- name: Install dependencies
3231
run: |
3332
python -m pip install --upgrade pip
3433
pip install black flake8 mypy
3534
3635
- name: Check code formatting with black
37-
run: black --check db_storage_manager/ || echo "Code formatting check completed"
36+
run: |
37+
black --check db_storage_manager/ || echo "Code formatting issues found (non-blocking)"
3838
continue-on-error: true
3939

4040
- name: Lint with flake8
@@ -57,23 +57,22 @@ jobs:
5757
steps:
5858
- name: Checkout code
5959
uses: actions/checkout@v4
60+
env:
61+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
6062

6163
- name: Set up Python ${{ matrix.python-version }}
6264
uses: actions/setup-python@v5
6365
with:
6466
python-version: ${{ matrix.python-version }}
67+
env:
68+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
6569

6670
- name: Install system dependencies (Ubuntu)
6771
if: matrix.os == 'ubuntu-latest'
6872
run: |
6973
sudo apt-get update
7074
sudo apt-get install -y python3-pyqt6 python3-pyqt6.qtcharts
7175
72-
- name: Install system dependencies (macOS)
73-
if: matrix.os == 'macos-latest'
74-
run: |
75-
brew install pyqt6
76-
7776
- name: Install dependencies
7877
run: |
7978
python -m pip install --upgrade pip
@@ -87,7 +86,10 @@ jobs:
8786
continue-on-error: true
8887

8988
- name: Verify application can be imported
90-
run: python -c "import db_storage_manager; print('Import successful')" || echo "Import check skipped"
89+
run: |
90+
python -c "import db_storage_manager; print('Import successful')" || \
91+
python -c "import sys; sys.path.insert(0, '.'); import db_storage_manager; print('Import successful')" || \
92+
echo "Import check skipped"
9193
continue-on-error: true
9294

9395
build:
@@ -102,28 +104,22 @@ jobs:
102104
steps:
103105
- name: Checkout code
104106
uses: actions/checkout@v4
107+
env:
108+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
105109

106110
- name: Set up Python ${{ matrix.python-version }}
107111
uses: actions/setup-python@v5
108112
with:
109113
python-version: ${{ matrix.python-version }}
110-
111-
- name: Set up Node.js 24
112-
uses: actions/setup-node@v4
113-
with:
114-
node-version: '24'
114+
env:
115+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
115116

116117
- name: Install system dependencies (Ubuntu)
117118
if: matrix.os == 'ubuntu-latest'
118119
run: |
119120
sudo apt-get update
120121
sudo apt-get install -y python3-pyqt6 python3-pyqt6.qtcharts
121122
122-
- name: Install system dependencies (macOS)
123-
if: matrix.os == 'macos-latest'
124-
run: |
125-
brew install pyqt6
126-
127123
- name: Install dependencies
128124
run: |
129125
python -m pip install --upgrade pip

.github/workflows/release.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,15 @@ jobs:
6464
steps:
6565
- name: Checkout code
6666
uses: actions/checkout@v4
67-
68-
- name: Set up Node.js 24
69-
uses: actions/setup-node@v4
70-
with:
71-
node-version: '24'
67+
env:
68+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
7269

7370
- name: Download all artifacts
7471
uses: actions/download-artifact@v4
7572
with:
7673
path: dist/
74+
env:
75+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
7776

7877
- name: Create Release
7978
uses: softprops/action-gh-release@v1

0 commit comments

Comments
 (0)