Skip to content

Commit eec737d

Browse files
chore: update dependencies (#551)
* chore: update dependencies Signed-off-by: Rene Leonhardt <[email protected]> * review: use previous (release) branches Signed-off-by: Rene Leonhardt <[email protected]> * review: restore duplicated matrix entries Signed-off-by: Rene Leonhardt <[email protected]> * review: configure APP_VERSION for docker build Signed-off-by: Rene Leonhardt <[email protected]> --------- Signed-off-by: Rene Leonhardt <[email protected]>
1 parent 87b0f23 commit eec737d

File tree

13 files changed

+74
-58
lines changed

13 files changed

+74
-58
lines changed

.github/dependabot.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,24 @@
1313
# limitations under the License.
1414

1515
version: 2
16-
# See https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.
16+
# See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/dependabot-options-reference
1717
updates:
1818
- package-ecosystem: "pip"
19-
directory: "/"
19+
directories:
20+
- "/"
21+
# - "slsa_for_models/install" # requirement lockfiles have to be maintained manually
2022
schedule:
2123
interval: "weekly"
2224
groups:
2325
all:
2426
patterns:
2527
- "*"
28+
- package-ecosystem: "docker"
29+
directories:
30+
- "/"
31+
- "slsa_for_models/kubeflow/images/*"
32+
schedule:
33+
interval: "weekly"
2634
- package-ecosystem: "github-actions"
2735
directory: "/"
2836
schedule:
@@ -31,3 +39,8 @@ updates:
3139
all:
3240
patterns:
3341
- "*"
42+
allow:
43+
- dependency-name: "pypa/hatch"
44+
versions: [ "install" ] # stay on "install" branch
45+
- dependency-name: "github/codeql-action"
46+
versions: [ ">=4.0.0" ] # stay on "v4" tag (and "v5" in the future)

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454

5555
# Initializes the CodeQL tools for scanning.
5656
- name: Initialize CodeQL
57-
uses: github/codeql-action/init@f9a7c6738f28efb36e31d49c53a201a9c5d6a476 # v2.14.2
57+
uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
5858
with:
5959
languages: ${{ matrix.language }}
6060
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -68,7 +68,7 @@ jobs:
6868
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
6969
# If this step fails, then you should remove it and run the build manually (see below)
7070
- name: Autobuild
71-
uses: github/codeql-action/autobuild@f9a7c6738f28efb36e31d49c53a201a9c5d6a476 # v2.14.2
71+
uses: github/codeql-action/autobuild@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
7272

7373
# ℹ️ Command-line programs to run using the OS shell.
7474
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -81,6 +81,6 @@ jobs:
8181
# ./location_of_script_within_repo/buildscript.sh
8282

8383
- name: Perform CodeQL Analysis
84-
uses: github/codeql-action/analyze@f9a7c6738f28efb36e31d49c53a201a9c5d6a476 # v2.14.2
84+
uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
8585
with:
8686
category: "/language:${{matrix.language}}"

.github/workflows/cross_os.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
name: model.zip
7474
path: model_root/
7575
- name: Set up Hatch
76-
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
76+
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc # install
7777
- name: store beacon token into oidc-token.txt
7878
uses: sigstore-conformance/extremely-dangerous-public-oidc-beacon@b517a742e5a3db9e3cbf8e2e1c792b36982f78db # main
7979
- name: Sign the model
@@ -109,7 +109,7 @@ jobs:
109109
with:
110110
name: ${{ matrix.signed-with-os }}-model.sig
111111
- name: Set up Hatch
112-
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
112+
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc # install
113113
- name: Verify the model
114114
run: |
115115
hatch run python -m model_signing verify sigstore model_root/ --use_staging --signature model.sig \

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
with:
3535
persist-credentials: false
3636
- name: Set up Hatch
37-
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
37+
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc # install
3838
- name: build docs
3939
run: hatch run docs:build
4040
- name: upload docs artifact

.github/workflows/integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
with:
4545
persist-credentials: false
4646
- name: Set up Hatch
47-
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
47+
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc # install
4848
- name: Run integration tests
4949
run: |
5050
set -euxo pipefail

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
with:
7979
persist-credentials: false
8080
- name: Set up Hatch
81-
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
81+
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc # install
8282
- name: Register pytype problem matcher
8383
run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/pytype-problem-matcher.json"
8484
- name: Run type check
@@ -95,7 +95,7 @@ jobs:
9595
with:
9696
persist-credentials: false
9797
- name: Set up Hatch
98-
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
98+
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc # install
9999
- name: Run python linting
100100
run: hatch fmt --check
101101
env:

.github/workflows/release.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
with:
3434
persist-credentials: false
3535
- name: Set up Hatch
36-
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
36+
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc # install
3737
- name: Build artifacts
3838
run: hatch build
3939
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -83,6 +83,12 @@ jobs:
8383
username: ${{ github.actor }}
8484
password: ${{ secrets.GITHUB_TOKEN }}
8585

86+
- name: Convert tag to version
87+
run: |
88+
tag="${{ github.event.release.tag_name }}"
89+
version=${tag#v} # Remove leading 'v' prefix
90+
echo "APP_VERSION=${version}" >> $GITHUB_ENV
91+
8692
- name: Build minimal image
8793
id: build_minimal_image
8894
uses: redhat-actions/buildah-build@7a95fa7ee0f02d552a32753e7414641a04307056 # v2.13
@@ -95,6 +101,7 @@ jobs:
95101
oci: false
96102
build-args: |
97103
BUILD_TYPE=minimal
104+
APP_VERSION=${{ env.APP_VERSION }}
98105
99106
- id: docker_meta_minimal
100107
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
@@ -129,6 +136,7 @@ jobs:
129136
oci: false
130137
build-args: |
131138
BUILD_TYPE=full
139+
APP_VERSION=${{ env.APP_VERSION }}
132140
133141
- id: docker_meta_full
134142
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,6 @@ jobs:
8282

8383
# Upload the results to GitHub's code scanning dashboard.
8484
- name: "Upload to code-scanning"
85-
uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
85+
uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
8686
with:
8787
sarif_file: results.sarif

.github/workflows/unit_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
with:
4141
persist-credentials: false
4242
- name: Set up Hatch
43-
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
43+
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc # install
4444
- name: Run unit tests (with coverage report at the end)
4545
run: |
4646
set -euxo pipefail

Containerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
# Default
1616
ARG BUILD_TYPE=minimal
1717

18-
FROM python:3.13-slim AS base_builder
18+
FROM python:3.13-slim AS base
19+
20+
FROM base AS base_builder
1921

2022
RUN apt-get update && \
2123
apt-get install -y --no-install-recommends \
@@ -32,11 +34,11 @@ WORKDIR /app
3234
COPY . /app
3335
RUN pip install .[pkcs11,otel]
3436

35-
FROM python:3.13-slim AS minimal_image
37+
FROM base AS minimal_image
3638
COPY --from=minimal_install /usr/local/bin /usr/local/bin
3739
COPY --from=minimal_install /usr/local/lib/python3.13/site-packages /usr/local/lib/python3.13/site-packages
3840

39-
FROM python:3.13-slim AS full_image
41+
FROM base AS full_image
4042
COPY --from=full_install /usr/local/bin /usr/local/bin
4143
COPY --from=full_install /usr/local/lib/python3.13/site-packages /usr/local/lib/python3.13/site-packages
4244

@@ -45,7 +47,7 @@ FROM ${BUILD_TYPE}_image AS final_image
4547
ENTRYPOINT ["model_signing"]
4648
CMD ["--help"]
4749

48-
ARG APP_VERSION="1.0.1"
50+
ARG APP_VERSION="1.1.1"
4951

5052
LABEL org.opencontainers.image.title="Model Transparency Library" \
5153
org.opencontainers.image.description="Supply chain security for ML" \

0 commit comments

Comments
 (0)