Skip to content

Commit dee8949

Browse files
committed
Merge remote-tracking branch 'origin/main' into lelia/ce-224-cli-exclude-license-details-flag-not-wired-through-to
2 parents 970fb55 + ce9f0e1 commit dee8949

12 files changed

Lines changed: 742 additions & 273 deletions

File tree

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: "Set up Docker"
2+
description: >-
3+
Set up QEMU + Docker Buildx and authenticate to Docker Hub for multi-arch
4+
image builds. Centralizes the QEMU/Buildx/login trio used by release,
5+
preview, and stable workflows.
6+
7+
inputs:
8+
dockerhub-username:
9+
description: "Docker Hub username (pass from secrets)"
10+
required: true
11+
dockerhub-token:
12+
description: "Docker Hub token/password (pass from secrets)"
13+
required: true
14+
15+
runs:
16+
using: "composite"
17+
steps:
18+
- uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
19+
- uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
20+
- uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
21+
with:
22+
username: ${{ inputs.dockerhub-username }}
23+
password: ${{ inputs.dockerhub-token }}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: "Set up Hatch build tooling"
2+
description: >-
3+
Install the pinned hatch / hatchling / virtualenv toolchain used to build
4+
and publish the package. Assumes Python is already set up by the caller.
5+
6+
runs:
7+
using: "composite"
8+
steps:
9+
- shell: bash
10+
run: |
11+
python -m pip install --upgrade pip
12+
pip install "virtualenv<20.36"
13+
pip install hatchling==1.27.0 hatch==1.14.0
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: "Set up Socket Firewall"
2+
description: >-
3+
Set up the requested language toolchain and install Socket Firewall (free
4+
or enterprise edition) so subsequent steps can run package-manager commands
5+
wrapped with `sfw`. Defaults to free/anonymous mode (no API token -- safe on
6+
untrusted / Dependabot / fork PRs). Pass mode: firewall-enterprise +
7+
socket-token for full org-policy enforcement on trusted maintainer PRs.
8+
9+
inputs:
10+
python:
11+
description: "Set up Python 3.12"
12+
default: "false"
13+
node:
14+
description: "Set up Node 20 (needed for npm-wrapped checks)"
15+
default: "false"
16+
uv:
17+
description: "Install uv (implies Python)"
18+
default: "false"
19+
mode:
20+
description: "socketdev/action mode: firewall-free or firewall-enterprise"
21+
default: "firewall-free"
22+
socket-token:
23+
description: "Socket API token (only used/required for firewall-enterprise)"
24+
default: ""
25+
26+
runs:
27+
using: "composite"
28+
steps:
29+
- if: ${{ inputs.python == 'true' || inputs.uv == 'true' }}
30+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
31+
with:
32+
python-version: "3.12"
33+
34+
- if: ${{ inputs.node == 'true' }}
35+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
36+
with:
37+
node-version: "20"
38+
39+
# Official Socket setup action. Wires up sfw routing correctly.
40+
# socket-token is ignored in firewall-free mode and empty when absent.
41+
- uses: socketdev/action@ba6de6cc0565af1f42295590380973573297e31f # v1.3.2
42+
with:
43+
mode: ${{ inputs.mode }}
44+
socket-token: ${{ inputs.socket-token }}
45+
46+
- if: ${{ inputs.uv == 'true' }}
47+
name: Install uv
48+
shell: bash
49+
run: python -m pip install --upgrade pip uv

.github/dependabot.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ updates:
3636
cooldown:
3737
default-days: 7
3838

39-
# GitHub Actions used in workflows
39+
# GitHub Actions used in workflows and local composite actions.
4040
- package-ecosystem: "github-actions"
41-
directory: "/"
41+
directories:
42+
- "/"
43+
- "/.github/actions/*"
4244
schedule:
4345
interval: "weekly"
4446
open-pull-requests-limit: 2

.github/workflows/dependabot-review.yml

Lines changed: 0 additions & 205 deletions
This file was deleted.

0 commit comments

Comments
 (0)