Skip to content

Commit f46e697

Browse files
authored
Merge branch 'main' into add-semaphoreci-oidc
2 parents 247fb2e + 5c1a18e commit f46e697

File tree

372 files changed

+19515
-11618
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

372 files changed

+19515
-11618
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
id-token: write
2323
steps:
2424
- name: Check out repository
25-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
25+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2626
with:
2727
persist-credentials: false
2828
- name: Set up Depot CLI
@@ -87,12 +87,12 @@ jobs:
8787
name: ${{ matrix.name }}
8888
steps:
8989
- name: Check out repository
90-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
90+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
9191
with:
9292
persist-credentials: false
9393
- name: Cache mypy results
9494
if: ${{ (matrix.name == 'Lint') }}
95-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
95+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
9696
with:
9797
path: |
9898
dev/.mypy_cache
@@ -122,13 +122,13 @@ jobs:
122122
options: --health-cmd "pg_isready --username=postgres --dbname=postgres" --health-interval 10s --health-timeout 5s --health-retries 5
123123
steps:
124124
- name: Check out repository
125-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
125+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
126126
with:
127127
persist-credentials: false
128128
- name: Dotenv Action
129129
# We need to load the environment variables to run the CLI
130130
id: dotenv
131-
uses: falti/dotenv-action@a33be0b8cf6a6e6f1b82cc9f3782061ab1022be5 # v1.1.4
131+
uses: falti/dotenv-action@f4656c46de6bc223dda660f6724d52537bc0642a # v1.1.5
132132
with:
133133
path: dev/environment
134134
export-variables: true

.github/workflows/codeql-analysis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
41+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4242
with:
4343
persist-credentials: false
4444

4545
- name: Set up Python
4646
if: matrix.language == 'python'
47-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
47+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
4848

4949
- name: Install dependencies
5050
# Needed for pycurl
@@ -54,7 +54,7 @@ jobs:
5454
5555
# Initializes the CodeQL tools for scanning.
5656
- name: Initialize CodeQL
57-
uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
57+
uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
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#, or Java).
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@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
71+
uses: github/codeql-action/autobuild@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
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@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
84+
uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
8585
with:
8686
category: "/language:${{matrix.language}}"

.github/workflows/dev-env-test.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ jobs:
99
build:
1010
# TODO: Should we test on other platforms like Windows and Mac?
1111
runs-on: ubuntu-24.04
12+
permissions:
13+
contents: read
1214
steps:
13-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
15+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1416
with:
1517
persist-credentials: false
1618
- run: make build

.github/workflows/node-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
name: ${{ matrix.name }}
2828
steps:
2929
- name: Check out repository
30-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
30+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3131
with:
3232
persist-credentials: false
33-
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
33+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
3434
with:
35-
node-version: 25.0.0
35+
node-version: 25.2.1
3636
cache: 'npm'
3737
- name: Install Node dependencies
3838
run: npm ci

.github/workflows/zizmor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ jobs:
2020
actions: read
2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
23+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2424
with:
2525
persist-credentials: false
2626
- name: Setup Python
27-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
27+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
2828
- name: Run zizmor
2929
run: pipx run zizmor --format sarif . > results.sarif
3030
- name: Upload SARIF file
31-
uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
31+
uses: github/codeql-action/upload-sarif@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
3232
with:
3333
# Path to SARIF file relative to the root of the repository
3434
sarif_file: results.sarif

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.13.8
1+
3.14.2

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Set variables reused in Dockerfile
2-
ARG PYTHON_IMAGE_VERSION=3.13.8-slim-bookworm
2+
ARG PYTHON_IMAGE_VERSION=3.14.2-slim-bookworm
33

44
# First things first, we build an image which is where we're going to compile
55
# our static assets with. We use this stage in development.
6-
FROM node:25.2.1-bookworm AS static-deps
6+
FROM node:25.4.0-bookworm AS static-deps
77

88
WORKDIR /opt/warehouse/src/
99

dev/compose/opensearch/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM opensearchproject/opensearch:2.13.0
1+
FROM opensearchproject/opensearch:2.19.4
22

33
RUN opensearch-plugin remove opensearch-skills --purge
44
RUN opensearch-plugin remove opensearch-ml --purge

dev/environment

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ BREACHED_PASSWORDS=warehouse.accounts.NullPasswordBreachedService
5151
OIDC_BACKEND=warehouse.oidc.services.NullOIDCPublisherService
5252
INTEGRITY_BACKEND=warehouse.attestations.services.NullIntegrityService
5353

54+
# Use NullOAuthClient for local development (no GitHub App needed)
55+
GITHUB_OAUTH_BACKEND=warehouse.accounts.oauth.NullOAuthClient
56+
# For real GitHub App integration, uncomment and configure:
57+
# GITHUB_OAUTH_BACKEND=warehouse.accounts.oauth.GitHubAppClient client_id=Iv2.your_client_id client_secret=your_client_secret
58+
5459
METRICS_BACKEND=warehouse.metrics.DataDogMetrics host=notdatadog
5560

5661
STATUSPAGE_URL=https://2p66nmmycsj3.statuspage.io

docker-compose.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,11 @@ services:
165165
FILES_BACKEND: "warehouse.packaging.services.LocalFileStorage path=/var/opt/warehouse/packages/ url=http://files:9001/packages/{path}"
166166
ARCHIVE_FILES_BACKEND: "warehouse.packaging.services.LocalArchiveFileStorage path=/var/opt/warehouse/packages-archive/ url=http://files:9001/packages-archive/{path}"
167167
SIMPLE_BACKEND: "warehouse.packaging.services.LocalSimpleStorage path=/var/opt/warehouse/simple/ url=http://files:9001/simple/{path}"
168+
depends_on:
169+
db:
170+
condition: service_healthy
171+
redis:
172+
condition: service_started
168173

169174
rstuf-api:
170175
image: ghcr.io/repository-service-tuf/repository-service-tuf-api:v0.12.0b1

0 commit comments

Comments
 (0)