Skip to content

Commit f25739b

Browse files
joe0BABjoe0BAB
committed
fix(ci): get pipelines running again
1 parent 536fb51 commit f25739b

Some content is hidden

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

56 files changed

+946
-347
lines changed

‎.github/actions/go/action.yml‎

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

‎.github/workflows/go-work-check.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
contents: write
1515
steps:
1616
- uses: actions/checkout@v4
17-
- uses: ./.github/actions/go
17+
- name: Setup Go
18+
uses: actions/setup-go@v5
1819
with:
19-
app_id: ${{ vars.DOCKER_READ_APP_ID }}
20-
app_private_key: ${{ secrets.DOCKER_READ_APP_PRIVATE_KEY }}
20+
go-version-file: go.work
2121
- name: Check if go work sync/vendor is clean
2222
run: |-
2323
go work sync

‎.github/workflows/gomodguard.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
- name: Hub login
1919
uses: docker/login-action@v3
2020
with:
21-
username: ${{ vars.DOCKERBUILDBOT_USERNAME }}
22-
password: ${{ secrets.DOCKERBUILDBOT_WRITE_PAT }}
21+
username: dockerpublicbot
22+
password: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
2323

2424
- name: Set up Docker Buildx
2525
id: buildx

‎.github/workflows/govulncheck.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
- name: Hub login
1919
uses: docker/login-action@v3
2020
with:
21-
username: ${{ vars.DOCKERBUILDBOT_USERNAME }}
22-
password: ${{ secrets.DOCKERBUILDBOT_WRITE_PAT }}
21+
username: dockerpublicbot
22+
password: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
2323

2424
- name: Set up Docker Buildx
2525
id: buildx

‎.github/workflows/keychain.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
- name: Hub login
3232
uses: docker/login-action@v3
3333
with:
34-
username: ${{ vars.DOCKERBUILDBOT_USERNAME }}
35-
password: ${{ secrets.DOCKERBUILDBOT_WRITE_PAT }}
34+
username: dockerpublicbot
35+
password: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
3636
- name: Set up Docker Buildx
3737
id: buildx
3838
uses: docker/setup-buildx-action@v3
@@ -56,10 +56,10 @@ jobs:
5656
- windows-2025
5757
steps:
5858
- uses: actions/checkout@v4
59-
- uses: ./.github/actions/go
59+
- name: Setup Go
60+
uses: actions/setup-go@v5
6061
with:
61-
app_id: ${{ vars.DOCKER_READ_APP_ID }}
62-
app_private_key: ${{ secrets.DOCKER_READ_APP_PRIVATE_KEY }}
62+
go-version-file: go.work
6363
- name: Test keychain
6464
run: make keychain-unit-tests
6565
tests-macos:
@@ -77,9 +77,9 @@ jobs:
7777
- macOS-14
7878
steps:
7979
- uses: actions/checkout@v4
80-
- uses: ./.github/actions/go
80+
- name: Setup Go
81+
uses: actions/setup-go@v5
8182
with:
82-
app_id: ${{ vars.DOCKER_READ_APP_ID }}
83-
app_private_key: ${{ secrets.DOCKER_READ_APP_PRIVATE_KEY }}
83+
go-version-file: go.work
8484
- name: Test keychain
8585
run: make keychain-unit-tests

‎.github/workflows/lint.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
contents: write
1515
steps:
1616
- uses: actions/checkout@v4
17-
- uses: ./.github/actions/go
17+
- name: Setup Go
18+
uses: actions/setup-go@v5
1819
with:
19-
app_id: ${{ vars.DOCKER_READ_APP_ID }}
20-
app_private_key: ${{ secrets.DOCKER_READ_APP_PRIVATE_KEY }}
20+
go-version-file: go.work
2121
- name: Hub login
2222
uses: docker/login-action@v3
2323
with:
24-
username: ${{ vars.DOCKERBUILDBOT_USERNAME }}
25-
password: ${{ secrets.DOCKERBUILDBOT_WRITE_PAT }}
24+
username: dockerpublicbot
25+
password: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
2626
- name: Set up Docker Buildx
2727
id: buildx
2828
uses: docker/setup-buildx-action@v3

‎.github/workflows/proto-check.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
- name: Hub login
2323
uses: docker/login-action@v3
2424
with:
25-
username: ${{ vars.DOCKERBUILDBOT_USERNAME }}
26-
password: ${{ secrets.DOCKERBUILDBOT_WRITE_PAT }}
25+
username: dockerpublicbot
26+
password: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
2727

2828
- name: Set up Docker Buildx
2929
id: buildx

‎.github/workflows/proto-lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
- name: Hub login
2323
uses: docker/login-action@v3
2424
with:
25-
username: ${{ vars.DOCKERBUILDBOT_USERNAME }}
26-
password: ${{ secrets.DOCKERBUILDBOT_WRITE_PAT }}
25+
username: dockerpublicbot
26+
password: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
2727

2828
- name: Set up Docker Buildx
2929
id: buildx

‎.github/workflows/unittests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v4
13-
- uses: ./.github/actions/go
13+
- name: Setup Go
14+
uses: actions/setup-go@v5
1415
with:
15-
app_id: ${{ vars.DOCKER_READ_APP_ID }}
16-
app_private_key: ${{ secrets.DOCKER_READ_APP_PRIVATE_KEY }}
16+
go-version-file: go.work
1717
- name: Unit Tests
1818
run: make unit-tests

‎Dockerfile‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,11 @@ ENV CXX=o64-clang++
3838
ARG TARGETOS
3939
FROM ${TARGETOS}-base AS lint
4040
ENV CGO_ENABLED=1
41-
ENV GOPRIVATE=github.com/docker/*
4241
COPY --link --from=lint-base /usr/bin/golangci-lint /usr/bin/golangci-lint
4342
RUN apk add --no-cache openssh-client
4443
WORKDIR /app
4544
RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
4645
RUN --mount=type=bind,target=.,ro \
47-
--mount=type=secret,id=GH_TOKEN,env=GH_TOKEN \
4846
--mount=type=cache,target=/go/pkg/mod \
4947
--mount=type=ssh <<EOT
5048
set -euo pipefail
@@ -55,16 +53,6 @@ RUN --mount=type=bind,target=.,ro \
5553
# If no token, prefer SSH for GitHub; if token exists, we’ll override below
5654
git config --global url."ssh://git@github.com/".insteadOf "https://github.com/"
5755

58-
# fallback for CI environments without ssh keys
59-
if [ -n "$GH_TOKEN" ]; then
60-
rm -f ~/.gitconfig
61-
git config --global user.email "106345742+cloud-platform-ci[bot]@users.noreply.github.com"
62-
git config --global user.name "cloud-platform-ci[bot]"
63-
git config --global url."https://x-access-token:${GH_TOKEN}@github.com".insteadOf "https://github.com"
64-
git config --global --add url."https://x-access-token:${GH_TOKEN}@github.com".insteadOf "ssh://git@github.com"
65-
git config --global --add url."https://x-access-token:${GH_TOKEN}@github.com/".insteadOf "git@github.com:"
66-
fi
67-
6856
for dir in $(go list -f '{{.Dir}}' -m); do
6957
(cd "$dir" && go mod tidy --diff)
7058
done

0 commit comments

Comments
 (0)