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

Commit a02f198

Browse files
committed
Another attempt to fix Linux CI
1 parent c138cfe commit a02f198

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 11 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-20.04, windows-latest, macos-latest]
23+
os: [ubuntu-18.04, windows-latest, macos-latest]
2424
include:
25-
- os: ubuntu-20.04
25+
- os: ubuntu-18.04
2626
friendlyName: Ubuntu
2727
- os: windows-latest
2828
friendlyName: Windows
@@ -42,8 +42,8 @@ jobs:
4242
gnome-keyring \
4343
libsecret-1-dev \
4444
dbus-x11 \
45-
python-keyring
46-
if: ${{ matrix.os == 'ubuntu-20.04' }}
45+
python-gnomekeyring
46+
if: ${{ matrix.os == 'ubuntu-18.04' }}
4747
name: Install additional dependencies
4848
4949
# This step can be removed as soon as official Windows arm64 builds are published:
@@ -63,26 +63,27 @@ jobs:
6363

6464
- run: |
6565
echo "Initialize dbus..."
66-
eval $(dbus-run-session -- sh);
66+
export NO_AT_BRIDGE=1;
67+
eval $(dbus-launch --sh-syntax);
6768
echo "Unlocking the keyring..."
68-
eval $(echo -n "" | /usr/bin/gnome-keyring-daemon --unlock)
69+
eval $(echo -n "" | /usr/bin/gnome-keyring-daemon --login)
6970
eval $(/usr/bin/gnome-keyring-daemon --components=secrets --start)
7071
echo "Create a test key using script..."
71-
python -c "import keyring;keyring.set_password('system', 'login', '');"
72+
python -c "import gnomekeyring;gnomekeyring.create_sync('login', '');"
7273
npm test
73-
if: ${{ matrix.os == 'ubuntu-20.04' }}
74+
if: ${{ matrix.os == 'ubuntu-18.04' }}
7475
name: Run tests (Linux)
7576
7677
- run: npm test
77-
if: ${{ matrix.os != 'ubuntu-20.04' }}
78+
if: ${{ matrix.os != 'ubuntu-18.04' }}
7879
name: Run tests (Windows/macOS)
7980

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

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

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

0 commit comments

Comments
 (0)