Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .github/workflows/_audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Audit"

on:
workflow_call:
# No inputs needed at this time
# No secrets needed

jobs:
audit:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_build-native-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Build Native Only"

on:
workflow_call:
# No inputs needed at this time
# No secrets needed

env:
# https://gist.github.com/NodeJSmith/e7e37f2d3f162456869f015f842bcf15
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "CodeQL Analysis"

on:
workflow_call:
# No inputs needed at this time
# No secrets needed

jobs:
analyze:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/_docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ name: "Publish Docker Image"

on:
workflow_call:
# No inputs needed at this time
secrets:
DOCKER_USERNAME:
required: false
DOCKER_PASSWORD:
required: false

jobs:
docker_publish:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/_ketryx_report_and_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ name: "Report build to Ketryx and check for approval"

on:
workflow_call:
# No inputs needed at this time
secrets:
KETRYX_PROJECT:
required: false
KETRYX_API_KEY:
required: false

env:
# https://gist.github.com/NodeJSmith/e7e37f2d3f162456869f015f842bcf15
Expand Down Expand Up @@ -35,7 +39,7 @@ jobs:

- name: Report build to Ketryx and check for approval
if: (!contains(github.event.head_commit.message, 'skip:ketryx'))
uses: Ketryx/ketryx-github-action@v1.4.0
uses: Ketryx/ketryx-github-action@40b13ef68c772e96e58ec01a81f5b216d7710186 # v1.4.0
continue-on-error: true # TODO(Helmut): Remove post having Ketryx configured to inspect the main branch
with:
project: ${{ secrets.KETRYX_PROJECT }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Lint"

on:
workflow_call:
# No inputs needed at this time
# No secrets needed

jobs:
lint:
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/_package-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ name: "Publish Package"

on:
workflow_call:
# No inputs needed at this time
secrets:
UV_PUBLISH_TOKEN:
required: false
SLACK_WEBHOOK_URL_RELEASE_ANNOUNCEMENT:
required: false
SLACK_CHANNEL_ID_RELEASE_ANNOUNCEMENT:
required: false

env:
# https://gist.github.com/NodeJSmith/e7e37f2d3f162456869f015f842bcf15
Expand Down Expand Up @@ -167,7 +173,11 @@ jobs:

- name: Publish distribution to Python Package Index at pypi.org
shell: bash
run: uv publish -t ${{ secrets.UV_PUBLISH_TOKEN }}
env:
UV_PUBLISH_TOKEN: ${{ secrets.UV_PUBLISH_TOKEN }}
run: |
# Use uv's credential storage - uv will read from UV_PUBLISH_TOKEN env var automatically
uv publish

- name: Download test results for ubuntu-latest generated in _test.yml
if: (!contains(github.event.head_commit.message, 'skip:test:all'))
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/_scheduled-audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@ name: "Scheduled Audit"

on:
workflow_call:
# No inputs needed at this time
secrets:
AIGNOSTICS_CLIENT_ID_DEVICE:
required: false
AIGNOSTICS_REFRESH_TOKEN:
required: false
GCP_CREDENTIALS:
required: false
BETTERSTACK_AUDIT_HEARTBEAT_URL:
required: false

jobs:
audit-scheduled:
Expand Down Expand Up @@ -40,8 +48,10 @@ jobs:

- name: Set up GCP credentials for bucket access
shell: bash
env:
GCP_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }}
run: |
echo "${{ secrets.GCP_CREDENTIALS }}" | base64 -d > credentials.json
echo "$GCP_CREDENTIALS" | base64 -d > credentials.json
echo "GOOGLE_APPLICATION_CREDENTIALS=$(pwd)/credentials.json" >> $GITHUB_ENV

- name: Audit
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/_scheduled-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@ name: "Scheduled Test"

on:
workflow_call:
# No inputs needed at this time
secrets:
AIGNOSTICS_CLIENT_ID_DEVICE:
required: false
AIGNOSTICS_REFRESH_TOKEN:
required: false
GCP_CREDENTIALS:
required: false
BETTERSTACK_HEARTBEAT_URL:
required: false

jobs:
test-scheduled:
Expand Down Expand Up @@ -40,8 +48,10 @@ jobs:

- name: Set up GCP credentials for bucket access
shell: bash
env:
GCP_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }}
run: |
echo "${{ secrets.GCP_CREDENTIALS }}" | base64 -d > credentials.json
echo "$GCP_CREDENTIALS" | base64 -d > credentials.json
echo "GOOGLE_APPLICATION_CREDENTIALS=$(pwd)/credentials.json" >> $GITHUB_ENV

- name: Test / scheduled
Expand Down
16 changes: 14 additions & 2 deletions .github/workflows/_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,17 @@ name: "Test"

on:
workflow_call:
# No inputs needed at this time
secrets:
AIGNOSTICS_CLIENT_ID_DEVICE:
required: false
AIGNOSTICS_REFRESH_TOKEN:
required: false
GCP_CREDENTIALS:
required: false
CODECOV_TOKEN:
required: false
SONAR_TOKEN:
required: false

env:
# https://gist.github.com/NodeJSmith/e7e37f2d3f162456869f015f842bcf15
Expand Down Expand Up @@ -91,8 +101,10 @@ jobs:

- name: Set up GCP credentials for bucket access
shell: bash
env:
GCP_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }}
run: |
echo "${{ secrets.GCP_CREDENTIALS }}" | base64 -d > credentials.json
echo "$GCP_CREDENTIALS" | base64 -d > credentials.json
echo "GOOGLE_APPLICATION_CREDENTIALS=$(pwd)/credentials.json" >> $GITHUB_ENV

- name: Validate installation
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/audit-scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ jobs:
permissions:
contents: read
id-token: write
secrets: inherit
secrets:
AIGNOSTICS_CLIENT_ID_DEVICE: ${{ secrets.AIGNOSTICS_CLIENT_ID_DEVICE }}
AIGNOSTICS_REFRESH_TOKEN: ${{ secrets.AIGNOSTICS_REFRESH_TOKEN }}
GCP_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }}
BETTERSTACK_AUDIT_HEARTBEAT_URL: ${{ secrets.BETTERSTACK_AUDIT_HEARTBEAT_URL }}
1 change: 0 additions & 1 deletion .github/workflows/build-native-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@ jobs:
contents: write
id-token: write
packages: write
secrets: inherit
23 changes: 16 additions & 7 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
contents: read
id-token: write
packages: read
secrets: inherit

audit:
if: (!contains(github.event.head_commit.message, 'skip:ci')) && (!contains(github.event.head_commit.message, 'build:native:only'))
Expand All @@ -30,7 +29,6 @@ jobs:
contents: read
id-token: write
packages: read
secrets: inherit

test:
if: (!contains(github.event.head_commit.message, 'skip:ci')) && (!contains(github.event.head_commit.message, 'build:native:only'))
Expand All @@ -40,7 +38,12 @@ jobs:
contents: read
id-token: write
packages: write
secrets: inherit
secrets:
AIGNOSTICS_CLIENT_ID_DEVICE: ${{ secrets.AIGNOSTICS_CLIENT_ID_DEVICE }}
AIGNOSTICS_REFRESH_TOKEN: ${{ secrets.AIGNOSTICS_REFRESH_TOKEN }}
GCP_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}


codeql:
Expand All @@ -51,7 +54,6 @@ jobs:
contents: read
packages: read
security-events: write
secrets: inherit


ketryx_report_and_check:
Expand All @@ -65,7 +67,9 @@ jobs:
contents: write
id-token: write
packages: write
secrets: inherit
secrets:
KETRYX_PROJECT: ${{ secrets.KETRYX_PROJECT }}
KETRYX_API_KEY: ${{ secrets.KETRYX_API_KEY }}

package_publish:

Expand All @@ -78,7 +82,10 @@ jobs:
contents: write
id-token: write
packages: write
secrets: inherit
secrets:
UV_PUBLISH_TOKEN: ${{ secrets.UV_PUBLISH_TOKEN }}
SLACK_WEBHOOK_URL_RELEASE_ANNOUNCEMENT: ${{ secrets.SLACK_WEBHOOK_URL_RELEASE_ANNOUNCEMENT }}
SLACK_CHANNEL_ID_RELEASE_ANNOUNCEMENT: ${{ secrets.SLACK_CHANNEL_ID_RELEASE_ANNOUNCEMENT }}

docker_publish:

Expand All @@ -91,4 +98,6 @@ jobs:
contents: read
id-token: write
packages: write
secrets: inherit
secrets:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
1 change: 0 additions & 1 deletion .github/workflows/codeql-scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ jobs:
contents: read
packages: read
security-events: write
secrets: inherit
6 changes: 5 additions & 1 deletion .github/workflows/test-scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ jobs:
permissions:
contents: read
id-token: write
secrets: inherit
secrets:
AIGNOSTICS_CLIENT_ID_DEVICE: ${{ secrets.AIGNOSTICS_CLIENT_ID_DEVICE }}
AIGNOSTICS_REFRESH_TOKEN: ${{ secrets.AIGNOSTICS_REFRESH_TOKEN }}
GCP_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }}
BETTERSTACK_HEARTBEAT_URL: ${{ secrets.BETTERSTACK_HEARTBEAT_URL }}
2 changes: 1 addition & 1 deletion tests/aignostics/wsi/service_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def test_serve_tiff_to_jpeg(user: User, silent_logging) -> None:
assert image.height > 0


def test_serve_tiff_to_jpeg_fails_on_broken_tiff(user: User, tmpdir) -> None:
def test_serve_tiff_to_jpeg_fails_on_broken_tiff(user: User, tmpdir, silent_logging) -> None:
"""Test that the tiff route falls back as expected on broken tiff.

- Spin up local webserver serving 4711 random bytes
Expand Down
Loading