Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
devops committed Jan 7, 2025
2 parents b99be28 + 141fe58 commit 7e6984a
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 33 deletions.
2 changes: 2 additions & 0 deletions .github/actions/setup-pyk-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ runs:
python-version: ${{ inputs.python-version }}
- name: 'Install Poetry'
uses: Gr1N/setup-poetry@v9
with:
poetry-version: '1.8.5'
- name: 'Install package'
shell: bash
run: poetry -C pyk install
2 changes: 1 addition & 1 deletion .github/actions/with-k-docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ USER user
WORKDIR /home/user

ENV PATH=/home/user/.local/bin:${PATH}
RUN curl -sSL https://install.python-poetry.org | python3 - \
RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.5 \
&& poetry --version
2 changes: 1 addition & 1 deletion .github/workflows/master-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
gh-release:
name: 'Publish GitHub Prerelease'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: 'Check out code'
uses: actions/checkout@v4
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

source-tarball:
name: 'Create source tarball'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
environment: production
steps:
- name: 'Check out code'
Expand Down Expand Up @@ -475,7 +475,7 @@ jobs:
pyk-publish:
name: 'Publish pyk'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
environment: production
permissions:
id-token: write
Expand All @@ -491,6 +491,8 @@ jobs:

- name: Install Poetry
uses: Gr1N/setup-poetry@v9
with:
poetry-version: '1.8.5'

- name: Build pyk
working-directory: pyk
Expand All @@ -512,10 +514,10 @@ jobs:
fi
sleep 10
done
notify-dependents:
name: 'Notify Dependents'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: pyk-publish
steps:
- name: Check out code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-actionlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: pull_request
jobs:
actionlint:
name: Run actionlint
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Download actionlint
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ concurrency:
jobs:
format-check:
name: 'Java: Linting'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: 'Check out code'
uses: actions/checkout@v4
Expand All @@ -30,7 +30,7 @@ jobs:

pyk-code-quality-checks:
name: 'Pyk: Code Quality & Unit Tests'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
timeout-minutes: 5
strategy:
fail-fast: false
Expand All @@ -56,7 +56,7 @@ jobs:

code-quality:
name: 'Code Quality Checks'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs:
- format-check
- pyk-code-quality-checks
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
name: 'Pyk: Nix Build'
strategy:
matrix:
os: [ubuntu-latest, macos-14]
os: [ubuntu-24.04, macos-14]
runs-on: ${{ matrix.os }}
steps:
- name: 'Check out code'
Expand Down Expand Up @@ -311,7 +311,7 @@ jobs:
pyk-regression-tests:
needs: test-frontend-package-ubuntu-jammy
name: 'Pyk: Regression Tests'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
timeout-minutes: 30
steps:
- name: 'Check out code'
Expand Down
21 changes: 0 additions & 21 deletions pyk/Dockerfile

This file was deleted.

0 comments on commit 7e6984a

Please sign in to comment.