Skip to content

Commit

Permalink
Merge pull request #135 from pyiron/expose_runner_everywhere
Browse files Browse the repository at this point in the history
[Patch] Set the default runner to `ubuntu-22.04` and expose it as input everywhere
  • Loading branch information
mbruns91 authored Oct 17, 2024
2 parents 9d25e72 + 54834d4 commit 23bb441
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 13 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,16 @@ name: Code scanning

on:
workflow_call:
inputs:
runner:
type: string
description: 'The main runner to use everywhere'
default: 'ubuntu-22.04'
required: false

jobs:
CodeQL-Build:
runs-on: ubuntu-latest
runs-on: ${{ inputs.runner }}
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/dependabot-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@ name: Update Dependabot PR

on:
workflow_call:
inputs:
runner:
type: string
description: 'The main runner to use everywhere'
default: 'ubuntu-22.04'
required: false

jobs:
dependabot:
runs-on: ubuntu-latest
runs-on: ${{ inputs.runner }}
if: (github.actor == 'dependabot[bot]')
steps:
- uses: actions/checkout@v4
Expand All @@ -29,4 +35,4 @@ jobs:
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.DEPENDABOT_WORKFLOW_TOKEN }}
branch: ${{ github.event.pull_request.head.ref }}
branch: ${{ github.event.pull_request.head.ref }}
9 changes: 7 additions & 2 deletions .github/workflows/pr-labeled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,16 @@ on:
description: 'Paths to an arbitrary number of (space-separated) conda environment yaml files'
default: .ci_support/environment.yml
required: false
runner:
type: string
description: 'The main runner to use everywhere'
default: 'ubuntu-22.04'
required: false

jobs:
format-black:
if: contains(github.event.pull_request.labels.*.name, 'format_black' )
runs-on: ubuntu-latest
runs-on: ${{ inputs.runner }}
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -49,4 +54,4 @@ jobs:
code-ql:
if: contains(github.event.pull_request.labels.*.name, 'run_CodeQL')
uses: pyiron/actions/.github/workflows/codeql.yml@v3.3.2
secrets: inherit
secrets: inherit
10 changes: 8 additions & 2 deletions .github/workflows/pr-target-opened.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,16 @@ name: PR target opened

on:
workflow_call:
inputs:
runner:
type: string
description: 'The main runner to use everywhere'
default: 'ubuntu-22.04'
required: false

jobs:
binder-badge:
runs-on: ubuntu-latest
runs-on: ${{ inputs.runner }}
permissions:
pull-requests: write
steps:
Expand All @@ -34,4 +40,4 @@ jobs:
})
env:
PR_HEAD_REF: ${{ github.event.pull_request.head.ref }}
PR_HEAD_USERREPO: ${{ github.event.pull_request.head.repo.full_name }}
PR_HEAD_USERREPO: ${{ github.event.pull_request.head.repo.full_name }}
2 changes: 1 addition & 1 deletion .github/workflows/push-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ on:
runner:
type: string
description: 'The main runner to use everywhere'
default: 'ubuntu-latest'
default: 'ubuntu-22.04'
required: false
runner-alt1:
type: string
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/pyproject-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,15 @@ on:
description: 'Whether to actually publish the result. Turning it off is useful for debugging new builds.'
default: true
required: false

runner:
type: string
description: 'The main runner to use everywhere'
default: 'ubuntu-22.04'
required: false

jobs:
pypi-release:
runs-on: ubuntu-latest
runs-on: ${{ inputs.runner }}
steps:
- uses: actions/checkout@v4
- uses: pyiron/actions/cached-miniforge@v3.3.2
Expand Down Expand Up @@ -112,4 +116,4 @@ jobs:
uses: pypa/gh-action-pypi-publish@release/v1
with: # Remove once trusted publisher works with reusable workflows
user: __token__ # Remove once trusted publisher works with reusable workflows
password: ${{ secrets.pypi_password }} # Remove once trusted publisher works with reusable workflows
password: ${{ secrets.pypi_password }} # Remove once trusted publisher works with reusable workflows
8 changes: 7 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@ name: Release

on:
workflow_call:
inputs:
runner:
type: string
description: 'The main runner to use everywhere'
default: 'ubuntu-22.04'
required: false

jobs:
pypi-release:
runs-on: ubuntu-latest
runs-on: ${{ inputs.runner }}
# environment: # Add once trusted publisher works with reusable workflows
# name: pypi # Add once trusted publisher works with reusable workflows
# url: https://pypi.org/p/${{ github.event.repository.name }} # Add once trusted publisher works with reusable workflows
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-and-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ on:
runner:
type: string
description: 'The main runner to use everywhere'
default: 'ubuntu-latest'
default: 'ubuntu-22.04'
required: false
python-version:
type: string
Expand Down

0 comments on commit 23bb441

Please sign in to comment.