Skip to content
This repository was archived by the owner on Jul 5, 2023. It is now read-only.

Commit abb5eaa

Browse files
committed
Manual condition of OS runner added as outputs for matrices are not currently supported
1 parent 2ddbf3c commit abb5eaa

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

.github/workflows/main.yaml

+4-11
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ on:
77
branches:
88
- main
99
workflow_call:
10-
outputs:
11-
venv:
12-
description: "Python virtual environment"
13-
value: ${{ jobs.setup.outputs.venv }}
1410
jobs:
1511
setup:
1612
defaults:
@@ -20,8 +16,6 @@ jobs:
2016
matrix:
2117
os: [ubuntu-latest, windows-latest, macos-latest]
2218
python-version: ["3.7", "3.8", "3.9", "3.10"]
23-
outputs:
24-
venv: ${{ steps.generate-outputs.outputs.venv }}
2519
runs-on: ${{ matrix.os }}
2620
steps:
2721
- name: Check out repository
@@ -30,9 +24,6 @@ jobs:
3024
uses: ./setup-action
3125
with:
3226
python-version: ${{ matrix.python-version }}
33-
- name: Generate outputs
34-
id: generate-outputs
35-
run: echo "venv=$VENV" >> $GITHUB_OUTPUT
3627
linting:
3728
defaults:
3829
run:
@@ -46,10 +37,12 @@ jobs:
4637
steps:
4738
- name: Run Black
4839
run: |
49-
source ${{ needs.setup.outputs.venv }}
40+
source .venv/scripts/activate
5041
black --check boostbuild
42+
if: runner.os == 'Windows'
5143
- name: Run Pylint
5244
run: |
53-
source ${{ needs.setup.outputs.venv }}
45+
source .venv/bin/activate
5446
pylint --rcfile pyproject.toml boostbuild
47+
if: runner.os != 'Windows'
5548

.github/workflows/publish.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
1919
PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
2020
run: |
21-
source ${{ needs.call-main.outputs.venv }}
21+
source .venv/bin/activate
2222
boost publish
2323

0 commit comments

Comments
 (0)