Skip to content

Commit

Permalink
Merge branch 'master' into renovate/actions-checkout-4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
MaxymVlasov authored Jan 15, 2025
2 parents 7a2a72c + 87b9f80 commit fb29602
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 17 deletions.
4 changes: 4 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
$schema: "https://docs.renovatebot.com/renovate-schema.json",
extends: ["local>SpotOnInc/renovate-config"],
// To make happy 'Validate PR title' GHA
commitMessageLowerCase: "never",
// Disable auto-rebase on every commit to avoid reaching Github limits on macos runners
rebaseWhen: "conflicted",
}
8 changes: 4 additions & 4 deletions .github/workflows/build-image-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ jobs:
- name: Set up QEMU
if: matrix.os != 'ubuntu-latest' || matrix.arch != 'amd64'
# yamllint disable-line rule:line-length
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
with:
platforms: arm64

- name: Set up Docker Buildx
# yamllint disable-line rule:line-length
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0

- name: Build if Dockerfile changed
if: steps.changed-files-specific.outputs.any_changed == 'true'
# yamllint disable-line rule:line-length
uses: docker/build-push-action@94f8f8c2eec4bc3f1d78c1755580779804cb87b2 # v6.0.1
uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
with:
context: .
build-args: |
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
&& matrix.os == 'ubuntu-latest'
&& matrix.arch == 'amd64'
# yamllint disable-line rule:line-length
uses: docker/build-push-action@94f8f8c2eec4bc3f1d78c1755580779804cb87b2 # v6.0.1
uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
with:
context: .
build-args: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Set up QEMU
# yamllint disable-line rule:line-length
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
- name: Set up Docker Buildx
# yamllint disable-line rule:line-length
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
- name: Login to GitHub Container Registry
# yamllint disable-line rule:line-length
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
Expand All @@ -39,12 +39,12 @@ jobs:
- name: Set up Docker Buildx
# yamllint disable-line rule:line-length
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0

- name: Build and Push release
if: github.event_name != 'schedule'
# yamllint disable-line rule:line-length
uses: docker/build-push-action@94f8f8c2eec4bc3f1d78c1755580779804cb87b2 # v6.0.1
uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
with:
context: .
build-args: |
Expand All @@ -62,7 +62,7 @@ jobs:
- name: Build and Push nightly
if: github.event_name == 'schedule'
# yamllint disable-line rule:line-length
uses: docker/build-push-action@94f8f8c2eec4bc3f1d78c1755580779804cb87b2 # v6.0.1
uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
with:
context: .
build-args: |
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ jobs:

steps:
- name: Switch to using Python 3.13 by default
uses: actions/setup-python@v5
# yamllint disable-line rule:line-length
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
python-version: 3.13
- name: Check out src from Git
Expand Down Expand Up @@ -269,7 +270,8 @@ jobs:

steps:
- name: Switch to using Python 3.13
uses: actions/setup-python@v5
# yamllint disable-line rule:line-length
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
python-version: 3.13

Expand Down Expand Up @@ -361,7 +363,8 @@ jobs:
>> "${GITHUB_OUTPUT}"
working-directory: dist
- name: Store the distribution packages
uses: actions/upload-artifact@v4
# yamllint disable-line rule:line-length
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
with:
name: >-
${{ needs.pre-setup.outputs.dists-artifact-name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}
# Skip terraform_tflint which interferes to commit pre-commit auto-fixes
# yamllint disable-line rule:line-length
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
python-version: '3.9'
- name: Execute pre-commit
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/reusable-tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ jobs:
Switch to using Python v${{ inputs.python-version }}
by default
id: python-install
uses: actions/setup-python@v5
# yamllint disable-line rule:line-length
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
python-version: ${{ inputs.python-version }}
Expand Down Expand Up @@ -264,7 +265,8 @@ jobs:
- name: Download all the dists
if: >-
contains(fromJSON('["metadata-validation", "pytest"]'), inputs.toxenv)
uses: actions/download-artifact@v4
# yamllint disable-line rule:line-length
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: ${{ inputs.dists-artifact-name }}
path: dist/
Expand Down Expand Up @@ -368,7 +370,8 @@ jobs:
if: >-
!cancelled()
&& steps.tox-run.outputs.cov-report-files != ''
uses: codecov/codecov-action@v4
# yamllint disable-line rule:line-length
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
with:
disable_search: true
fail_ci_if_error: >-
Expand Down

0 comments on commit fb29602

Please sign in to comment.