Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Commit a1600e6

Browse files
committed
Another attempt to fix Linux CI
1 parent c3e6bd4 commit a1600e6

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
strategy:
2121
matrix:
2222
node-version: [15.x]
23-
os: [ubuntu-18.04, windows-latest, macos-latest]
23+
os: [ubuntu-20.04, windows-latest, macos-latest]
2424
include:
25-
- os: ubuntu-18.04
25+
- os: ubuntu-20.04
2626
friendlyName: Ubuntu
2727
- os: windows-latest
2828
friendlyName: Windows
@@ -42,8 +42,9 @@ jobs:
4242
gnome-keyring \
4343
libsecret-1-dev \
4444
dbus-x11 \
45-
python-keyring
46-
if: ${{ matrix.os == 'ubuntu-18.04' }}
45+
python3-venv \
46+
python3-dev
47+
if: ${{ matrix.os == 'ubuntu-20.04' }}
4748
name: Install additional dependencies
4849
4950
# This step can be removed as soon as official Windows arm64 builds are published:
@@ -62,28 +63,28 @@ jobs:
6263
name: Build native module from source
6364

6465
- run: |
65-
echo "Initialize dbus..."
66-
export NO_AT_BRIDGE=1;
66+
python3 -m venv venv
67+
source venv/bin/activate
68+
pip3 install --upgrade pip
69+
pip3 install keyring
6770
eval $(dbus-launch --sh-syntax);
68-
echo "Unlocking the keyring..."
69-
eval $(echo -n "" | /usr/bin/gnome-keyring-daemon --login)
70-
eval $(/usr/bin/gnome-keyring-daemon --components=secrets --start)
71+
eval $(echo 'somecredstorepass' | gnome-keyring-daemon --unlock)
7172
echo "Create a test key using script..."
72-
python -c "import keyring;keyring.set_password('system', 'login', '');"
73+
python -c "import keyring;keyring.set_password('system', 'login', 'pwd');"
7374
npm test
74-
if: ${{ matrix.os == 'ubuntu-18.04' }}
75+
if: ${{ matrix.os == 'ubuntu-20.04' }}
7576
name: Run tests (Linux)
7677
7778
- run: npm test
78-
if: ${{ matrix.os != 'ubuntu-18.04' }}
79+
if: ${{ matrix.os != 'ubuntu-20.04' }}
7980
name: Run tests (Windows/macOS)
8081

8182
- run: npm run prebuild-napi-x64
8283
name: Prebuild (x64)
8384

8485
- run: npm run prebuild-napi-arm64
8586
name: Prebuild (arm64)
86-
if: ${{ matrix.os != 'ubuntu-18.04' }}
87+
if: ${{ matrix.os != 'ubuntu-20.04' }}
8788

8889
- run: npm run prebuild-napi-ia32
8990
if: ${{ matrix.os == 'windows-latest' }}
@@ -95,7 +96,7 @@ jobs:
9596
docker run --rm -v ${PWD}:/project node-keytar/i386 /bin/bash -c "cd /project && npm run prebuild-napi-ia32 && rm -rf build"
9697
docker build -t node-keytar/arm64-cross-compile docker/arm64-cross-compile
9798
docker run --rm -v ${PWD}:/project node-keytar/arm64-cross-compile /bin/bash -c "cd /project && npm run prebuild-napi-arm64"
98-
if: ${{ matrix.os == 'ubuntu-18.04' }}
99+
if: ${{ matrix.os == 'ubuntu-20.04' }}
99100
name: Prebuild (Linux x86 + ARM64)
100101
101102
- run: |

0 commit comments

Comments
 (0)