Skip to content

Commit 4924a17

Browse files
authored
Merge branch 'master' into tryvi_scanner
2 parents 5349304 + 48b3a29 commit 4924a17

File tree

6 files changed

+30
-3
lines changed

6 files changed

+30
-3
lines changed

.github/workflows/ci-cd.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,8 @@ jobs:
189189
python -m
190190
pip install
191191
--user
192-
setuptools-scm~=8.2
192+
setuptools-scm
193+
--constraint=dependencies/lock-files/dist-build-constraints.txt
193194
shell: bash
194195
- name: Set the current dist version from Git
195196
id: scm-version
@@ -505,6 +506,13 @@ jobs:
505506
secrets:
506507
codecov-token: ${{ secrets.CODECOV_TOKEN }}
507508

509+
lint-github-actions:
510+
name: Lint GitHub Actions
511+
permissions:
512+
security-events: write
513+
# yamllint disable-line rule:line-length
514+
uses: zizmorcore/workflow/.github/workflows/reusable-zizmor.yml@3bb5e95068d0f44b6d2f3f7e91379bed1d2f96a8
515+
508516
check: # This job does nothing and is only used for the branch protection
509517

510518
# Separate 'pull_request' check from other checks to avoid confusion in

.github/workflows/pre-commit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
run: >-
4848
curl -L "$(
4949
curl -s https://api.github.com/repos/hadolint/hadolint/releases/latest
50-
| grep -o -E -m 1 "https://.+?/hadolint-Linux-x86_64"
50+
| grep -o -E -i -m 1 "https://.+?/hadolint-linux-x86_64"
5151
)"
5252
> hadolint
5353
&& chmod +x hadolint && sudo mv hadolint /usr/bin/

.github/workflows/scheduled-runs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010

1111
permissions:
1212
contents: read
13+
security-events: write
1314

1415
run-name: >-
1516
🌃

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.12-alpine@sha256:9b8808206f4a956130546a32cbdd8633bc973b19db2923b7298e6f90cc26db08 AS python_base
1+
FROM python:3.12-alpine@sha256:02a73ead8397e904cea6d17e18516f1df3590e05dc8823bd5b1c7f849227d272 AS python_base
22

33
FROM python_base AS builder
44
ARG TARGETOS
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.12
3+
# by the following command:
4+
#
5+
# tox r -e pip-compile-build-lock --
6+
#
7+
packaging==24.1
8+
# via setuptools-scm
9+
setuptools-scm==8.1.0
10+
# via awx-plugins-core (pyproject.toml::build-system.requires)
11+
12+
# The following packages are considered to be unsafe in a requirements file:
13+
setuptools==73.0.0
14+
# via
15+
# awx-plugins-core (pyproject.toml::build-system.requires)
16+
# setuptools-scm

tox.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ commands =
153153
{posargs:}
154154
commands_post =
155155
package = skip
156+
set_env =
157+
PIP_CONSTRAINT = {toxinidir}{/}dependencies{/}lock-files{/}dist-build-constraints.txt
156158

157159

158160
[testenv:metadata-validation]

0 commit comments

Comments
 (0)