Skip to content

Commit 388055f

Browse files
committed
Merge branch 'main' into pfm-4021
2 parents 5b46d0c + 3265093 commit 388055f

136 files changed

Lines changed: 8136 additions & 136 deletions

File tree

Some content is hidden

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

‎.chainloop.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This indicates the [current version]+next
22
# to indicate that we are building a new version of the project
3-
projectVersion: v1.61.0+next
3+
projectVersion: v1.62.0+next
44

55
# Experimental feature used by Chainloop labs shared workflow https://github.com/chainloop-dev/labs
66
# It maps the material names with location in disk so they get automatically attested

‎.claude/skills/upgrading-golang/SKILL.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,14 @@ FROM arigaio/atlas@sha256:NEW_DIGEST as base
9999

100100
**7c. Update `./common.mk` for `make init`:**
101101

102+
**IMPORTANT**: Before updating the version in common.mk, ALWAYS test that the Atlas version is available via the curl command:
103+
104+
```bash
105+
curl -sSf https://atlasgo.sh | ATLAS_VERSION=vX.XX.X sh -s -- --version
106+
```
107+
108+
If the command fails or the version is not available, do NOT update common.mk. Only the Docker image should be updated in this case.
109+
102110
Update the Atlas CLI installation version in the `init` target:
103111

104112
Pattern to replace:

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Set up Go
4949
uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3.6.1
5050
with:
51-
go-version: "1.25.3"
51+
go-version: "1.25.5"
5252

5353
# Initializes the CodeQL tools for scanning.
5454
- name: Initialize CodeQL

‎.github/workflows/github_release.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
CHAINLOOP_WORKFLOW_NAME: chainloop-vault-release
2929
CHAINLOOP_PROJECT: chainloop
3030
GH_TOKEN: ${{ github.token }}
31+
INPUT_TAG: ${{ inputs.tag }}
3132
steps:
3233
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3334

@@ -37,12 +38,12 @@ jobs:
3738
3839
- name: Initialize Attestation
3940
run: |
40-
tag=$(echo -n ${{inputs.tag}} | cut -d / -f3)
41+
tag=$(echo -n "$INPUT_TAG" | cut -d / -f3)
4142
chainloop attestation init --workflow ${CHAINLOOP_WORKFLOW_NAME} --project ${CHAINLOOP_PROJECT} --version "$tag"
4243
4344
- name: Attest all assets
4445
run: |
45-
tag=$(echo -n ${{inputs.tag}} | cut -d / -f3)
46+
tag=$(echo -n "$INPUT_TAG" | cut -d / -f3)
4647
gh release download $tag -D /tmp/github-release
4748
for entry in $(ls /tmp/github-release); do
4849
# If the name is cas.cyclonedx.json, controlplane.cyclonedx.json or cli.cyclonedx.json, we need to add the attestation with the correct name
@@ -83,7 +84,7 @@ jobs:
8384
if: ${{ success() }}
8485
run: |
8586
chainloop_release_url="## Chainloop Attestation"$'\n'"[View the attestation of this release](https://app.chainloop.dev/attestation/${{ steps.attestation-push.outputs.attestation_sha }})"
86-
current_notes=$(gh release view ${{inputs.tag}} --json body -q '.body')
87+
current_notes=$(gh release view "$INPUT_TAG" --json body -q '.body')
8788
8889
if echo "$current_notes" | grep -q "## Chainloop Attestation"; then
8990
# Replace the existing Chainloop Attestation section with the new URL
@@ -94,4 +95,4 @@ jobs:
9495
fi
9596
9697
# Update the release notes and ignore if it fails since we might be lacking permissions to update the release notes
97-
gh release edit ${{inputs.tag}} -n "$modified_notes" || echo -n "Not enough permissions to edit the release notes. Skipping..."
98+
gh release edit "$INPUT_TAG" -n "$modified_notes" || echo -n "Not enough permissions to edit the release notes. Skipping..."

‎.github/workflows/lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
- uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3.6.1
2828
with:
29-
go-version: "1.25.3"
29+
go-version: "1.25.5"
3030

3131
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3232

@@ -67,7 +67,7 @@ jobs:
6767
6868
- uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3.6.1
6969
with:
70-
go-version: "1.25.3"
70+
go-version: "1.25.5"
7171

7272
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
7373

‎.github/workflows/release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
- name: Set up Go
8080
uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3.6.1
8181
with:
82-
go-version: "1.25.3"
82+
go-version: "1.25.5"
8383

8484
# install qemu binaries for multiarch builds (needed by goreleaser/buildx)
8585
- name: Setup qemu

‎.github/workflows/scm_configuration_check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: Gather runner context data
4040
run: |
41-
chainloop gather-runner-context --runner-token ${{ steps.generate-token.outputs.token }}
41+
chainloop gather-runner-context --runner-token ${{ steps.generate-token.outputs.token }} --branches=main
4242
4343
- name: Add runner context material to attestation
4444
run: |

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2828
- uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3.6.1
2929
with:
30-
go-version: "1.25.3"
30+
go-version: "1.25.5"
3131
cache: true
3232
cache-dependency-path: go.sum
3333

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ bin/
4141
# Go releaser
4242
dist/
4343

44+
# Node.js
45+
**/node_modules/
46+
**/dist/
47+
4448
# Dev configuration associated with authentication
4549
*/*/*/secret.yaml
4650

‎CLAUDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ make migration_lint # Lint migration files
135135

136136
## Key Technologies
137137

138-
- **Language**: Go 1.25.3
138+
- **Language**: Go 1.25.5
139139
- **API**: gRPC with HTTP/JSON gateway, Protocol Buffers with buf
140140
- **Database**: PostgreSQL with Ent ORM, Atlas for migrations
141141
- **Authentication**: OIDC, JWT tokens

0 commit comments

Comments
 (0)