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

bump all usages of python to at least 3.6 #375

Closed
wants to merge 4 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
strategy:
matrix:
node-version: [15.x]
os: [ubuntu-16.04, windows-latest, macos-latest]
os: [ubuntu-18.04, windows-latest, macos-latest]
include:
- os: ubuntu-16.04
- os: ubuntu-18.04
friendlyName: Ubuntu
- os: windows-latest
friendlyName: Windows
Expand All @@ -42,12 +42,15 @@ jobs:
gnome-keyring \
libsecret-1-dev \
dbus-x11 \
python-gnomekeyring
if: ${{ matrix.os == 'ubuntu-16.04' }}
python3-keyring \
python3
if: ${{ matrix.os == 'ubuntu-18.04' }}
name: Install additional dependencies

- run: npm install
name: Setup environment
- name: Setup environment
run: |
npm install
npm run build

- run: |
echo "Initialize dbus..."
Expand All @@ -57,13 +60,13 @@ jobs:
eval $(echo -n "" | /usr/bin/gnome-keyring-daemon --login)
eval $(/usr/bin/gnome-keyring-daemon --components=secrets --start)
echo "Create a test key using script..."
python -c "import gnomekeyring;gnomekeyring.create_sync('login', '');"
python -c "import keyring;keyring.set_password('login', '');"
npm test
if: ${{ matrix.os == 'ubuntu-16.04' }}
if: ${{ matrix.os == 'ubuntu-18.04' }}
name: Run tests (Linux)

- run: npm test
if: ${{ matrix.os != 'ubuntu-16.04' }}
if: ${{ matrix.os != 'ubuntu-18.04' }}
name: Run tests (Windows/macOS)

- run: |
Expand All @@ -83,7 +86,7 @@ jobs:
docker run --rm -v ${PWD}:/project node-keytar/i386 /bin/bash -c "cd /project && npm run prebuild-electron-ia32 && rm -rf build"
docker build -t node-keytar/arm64-cross-compile docker/arm64-cross-compile
docker run --rm -v ${PWD}:/project node-keytar/arm64-cross-compile /bin/bash -c "cd /project && npm run prebuild-electron-arm64"
if: ${{ matrix.os == 'ubuntu-16.04' }}
if: ${{ matrix.os == 'ubuntu-18.04' }}
name: Prebuild (Linux x86 + ARM64)

- run: |
Expand All @@ -103,10 +106,12 @@ jobs:
- uses: actions/checkout@v2
- name: install additional dependencies
run: |
apk add g++ make python2 libsecret-dev
apk add g++ make python3 libsecret-dev

- run: npm install
name: Setup environment
- name: Setup environment
run: |
npm install
npm run build

- run: |
npm run prebuild-node
Expand Down Expand Up @@ -139,7 +144,7 @@ jobs:
node-version: 15.x
registry-url: 'https://registry.npmjs.org'

- run: sudo apt-get install libsecret-1-dev
- run: sudo apt-get install libsecret-1-dev python3
name: Install additional dependencies

- run: npm install
Expand Down