Skip to content

Commit eb47e16

Browse files
DavSanchezDavSanchez
authored
ci: remove ssh key addition for private repos (#1133)
* ci: remove ssh key addition for private repos * chore: remove unneeded env var * ci: pull public git repos with https * ci: remove remaining ssh setup step * build: bump opamp-rs version * build: bump http dep to 1.3.1
1 parent 571b92a commit eb47e16

File tree

11 files changed

+33
-158
lines changed

11 files changed

+33
-158
lines changed

‎.github/workflows/component_image.yml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ on:
1515
type: boolean
1616
required: true
1717

18-
env:
19-
# Allows to fetch multiple private repo crates with different deploy keys.
20-
CARGO_NET_GIT_FETCH_WITH_CLI: true
21-
2218
jobs:
2319
build-image:
2420
runs-on: ubuntu-latest
@@ -41,13 +37,6 @@ jobs:
4137
with:
4238
toolchain: ${{ env.RUST_VERSION }}
4339

44-
- name: Give GitHub Actions access to private crates
45-
uses: webfactory/ssh-agent@v0.8.0
46-
with:
47-
ssh-private-key: |
48-
${{ secrets.CAOS_OAUTH_DEPLOY_KEY }}
49-
${{ secrets.CAOS_OPAMP_DEPLOY_KEY }}
50-
5140
- name: Build Agent Control for K8s
5241
env:
5342
AGENT_CONTROL_VERSION: ${{ inputs.image-tag }}

‎.github/workflows/component_packages.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ on:
1111
description: 'tag name for the packages'
1212
type: string
1313
required: true
14-
env:
15-
# Allows to fetch multiple private repo crates with different deploy keys.
16-
CARGO_NET_GIT_FETCH_WITH_CLI: true
1714

1815
jobs:
1916
build:
@@ -39,13 +36,6 @@ jobs:
3936
with:
4037
toolchain: ${{ env.RUST_VERSION }}
4138

42-
- name: Give GitHub Actions access to private crates
43-
uses: webfactory/ssh-agent@v0.8.0
44-
with:
45-
ssh-private-key: |
46-
${{ secrets.CAOS_OAUTH_DEPLOY_KEY }}
47-
${{ secrets.CAOS_OPAMP_DEPLOY_KEY }}
48-
4939
- name: Set tag and skip_upload=false for pre-release
5040
if: ${{ inputs.pre-release}}
5141
run: |

‎.github/workflows/nightly.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ on:
88
# Scheduled to run at 4 a.m on every day-of-week from Monday through Friday.
99
- cron: "0 4 * * 1-5"
1010

11-
env:
12-
# Allows to fetch multiple private repo crates with different deploy keys.
13-
CARGO_NET_GIT_FETCH_WITH_CLI: true
14-
1511
jobs:
1612
build-packages:
1713
name: Build packages
@@ -101,12 +97,6 @@ jobs:
10197
- uses: actions/checkout@v4
10298
with:
10399
submodules: true
104-
- name: Give GitHub Actions access to private crates
105-
uses: webfactory/ssh-agent@v0.8.0
106-
with:
107-
ssh-private-key: |
108-
${{ secrets.CAOS_OAUTH_DEPLOY_KEY }}
109-
${{ secrets.CAOS_OPAMP_DEPLOY_KEY }}
110100
- name: Setup Minikube
111101
uses: manusa/actions-setup-minikube@v2.10.0
112102
with:

‎.github/workflows/prerelease.yml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ on:
55
release:
66
types:
77
- prereleased
8-
env:
9-
# Allows to fetch multiple private repo crates with different deploy keys.
10-
CARGO_NET_GIT_FETCH_WITH_CLI: true
8+
119
# See https://docs.github.com/en/actions/using-jobs/using-concurrency
1210
name: pre-release
1311
jobs:
@@ -128,12 +126,6 @@ jobs:
128126
- uses: actions/checkout@v4
129127
with:
130128
submodules: true
131-
- name: Give GitHub Actions access to private crates
132-
uses: webfactory/ssh-agent@v0.8.0
133-
with:
134-
ssh-private-key: |
135-
${{ secrets.CAOS_OAUTH_DEPLOY_KEY }}
136-
${{ secrets.CAOS_OPAMP_DEPLOY_KEY }}
137129
- name: Setup Minikube
138130
uses: manusa/actions-setup-minikube@v2.10.0
139131
with:

‎.github/workflows/push_pr_check.yml‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ on:
99
concurrency:
1010
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1111
cancel-in-progress: true
12-
env:
13-
# Allows to fetch multiple private repo crates with different deploy keys.
14-
CARGO_NET_GIT_FETCH_WITH_CLI: true
1512

1613
name: checks
1714
jobs:
@@ -30,12 +27,6 @@ jobs:
3027
- uses: actions/checkout@v4
3128
with:
3229
submodules: true
33-
- name: Give GitHub Actions access to private crates
34-
uses: webfactory/ssh-agent@v0.8.0
35-
with:
36-
ssh-private-key: |
37-
${{ secrets.CAOS_OAUTH_DEPLOY_KEY }}
38-
${{ secrets.CAOS_OPAMP_DEPLOY_KEY }}
3930

4031
- name: Obtain Rust version from project
4132
run: |
@@ -75,13 +66,6 @@ jobs:
7566
with:
7667
submodules: true
7768

78-
- name: Give GitHub Actions access to private crates
79-
uses: webfactory/ssh-agent@v0.8.0
80-
with:
81-
ssh-private-key: |
82-
${{ secrets.CAOS_OAUTH_DEPLOY_KEY }}
83-
${{ secrets.CAOS_OPAMP_DEPLOY_KEY }}
84-
8569
- name: Obtain Rust version from project
8670
run: |
8771
RUST_VERSION=$(grep "rust-version" Cargo.toml | cut -d "=" -f2 | tr -d "[:space:]")
@@ -113,12 +97,6 @@ jobs:
11397
- uses: actions/checkout@v4
11498
with:
11599
submodules: true
116-
- name: Give GitHub Actions access to private crates
117-
uses: webfactory/ssh-agent@v0.8.0
118-
with:
119-
ssh-private-key: |
120-
${{ secrets.CAOS_OAUTH_DEPLOY_KEY }}
121-
${{ secrets.CAOS_OPAMP_DEPLOY_KEY }}
122100

123101
- name: Obtain Rust version from project
124102
run: |
@@ -157,13 +135,6 @@ jobs:
157135
with:
158136
submodules: true
159137

160-
- name: Give GitHub Actions access to private crates
161-
uses: webfactory/ssh-agent@v0.8.0
162-
with:
163-
ssh-private-key: |
164-
${{ secrets.CAOS_OAUTH_DEPLOY_KEY }}
165-
${{ secrets.CAOS_OPAMP_DEPLOY_KEY }}
166-
167138
- name: Obtain Rust version from project
168139
run: |
169140
RUST_VERSION=$(grep "rust-version" Cargo.toml | cut -d "=" -f2 | tr -d "[:space:]")

‎.github/workflows/push_pr_coverage.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ concurrency:
1010
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1111
cancel-in-progress: true
1212
name: coverage
13-
env:
14-
# Allows to fetch multiple private repo crates with different deploy keys.
15-
CARGO_NET_GIT_FETCH_WITH_CLI: true
1613

1714
jobs:
1815
coverage:
@@ -22,12 +19,6 @@ jobs:
2219
- uses: actions/checkout@v4
2320
with:
2421
submodules: true
25-
- name: Give GitHub Actions access to private crates
26-
uses: webfactory/ssh-agent@v0.8.0
27-
with:
28-
ssh-private-key: |
29-
${{ secrets.CAOS_OAUTH_DEPLOY_KEY }}
30-
${{ secrets.CAOS_OPAMP_DEPLOY_KEY }}
3122

3223
- name: Obtain Rust version from project
3324
run: |

‎.github/workflows/push_pr_package.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ on:
1111

1212
# See https://docs.github.com/en/actions/using-jobs/using-concurrency
1313
name: build-packages and image
14-
env:
15-
# Allows to fetch multiple private repo crates with different deploy keys.
16-
CARGO_NET_GIT_FETCH_WITH_CLI: true
14+
1715
jobs:
1816
build-packages:
1917
name: Build packages

‎.github/workflows/push_pr_test.yml‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ concurrency:
1010
cancel-in-progress: true
1111
name: test
1212

13-
env:
14-
# Allows to fetch multiple private repo crates with different deploy keys.
15-
CARGO_NET_GIT_FETCH_WITH_CLI: true
1613
jobs:
1714
release-build:
1815
runs-on: ubuntu-latest
@@ -21,12 +18,6 @@ jobs:
2118
- uses: actions/checkout@v4
2219
with:
2320
submodules: true
24-
- name: Give GitHub Actions access to private crates
25-
uses: webfactory/ssh-agent@v0.8.0
26-
with:
27-
ssh-private-key: |
28-
${{ secrets.CAOS_OAUTH_DEPLOY_KEY }}
29-
${{ secrets.CAOS_OPAMP_DEPLOY_KEY }}
3021

3122
- name: Obtain Rust version from project
3223
run: |
@@ -66,13 +57,6 @@ jobs:
6657
with:
6758
submodules: true
6859

69-
- name: Give GitHub Actions access to private crates
70-
uses: webfactory/ssh-agent@v0.8.0
71-
with:
72-
ssh-private-key: |
73-
${{ secrets.CAOS_OAUTH_DEPLOY_KEY }}
74-
${{ secrets.CAOS_OPAMP_DEPLOY_KEY }}
75-
7660
- name: Obtain Rust version from project
7761
run: |
7862
RUST_VERSION=$(grep "rust-version" Cargo.toml | cut -d "=" -f2 | tr -d "[:space:]")
@@ -126,18 +110,6 @@ jobs:
126110
with:
127111
submodules: true
128112

129-
- name: Give GitHub Actions access to private crates
130-
uses: webfactory/ssh-agent@v0.8.0
131-
with:
132-
ssh-private-key: |
133-
${{ secrets.CAOS_OAUTH_DEPLOY_KEY }}
134-
${{ secrets.CAOS_OPAMP_DEPLOY_KEY }}
135-
136-
- name: Apply webfactory/ssh-agent action configs to the container shh config
137-
run: |
138-
cat /root/.ssh/config >> /etc/ssh/ssh_config
139-
ssh-keyscan -H github.com >> /etc/ssh/ssh_known_hosts
140-
141113
- name: Obtain Rust version from project
142114
run: |
143115
RUST_VERSION=$(grep "rust-version" Cargo.toml | cut -d "=" -f2 | tr -d "[:space:]")
@@ -169,12 +141,6 @@ jobs:
169141
runs-on: ubuntu-latest
170142
steps:
171143
- uses: actions/checkout@v4
172-
- name: Give GitHub Actions access to private crates
173-
uses: webfactory/ssh-agent@v0.8.0
174-
with:
175-
ssh-private-key: |
176-
${{ secrets.CAOS_OAUTH_DEPLOY_KEY }}
177-
${{ secrets.CAOS_OPAMP_DEPLOY_KEY }}
178144
- name: Install Go
179145
uses: actions/setup-go@v5
180146
with:
@@ -190,12 +156,6 @@ jobs:
190156
- uses: actions/checkout@v4
191157
with:
192158
submodules: true
193-
- name: Give GitHub Actions access to private crates
194-
uses: webfactory/ssh-agent@v0.8.0
195-
with:
196-
ssh-private-key: |
197-
${{ secrets.CAOS_OAUTH_DEPLOY_KEY }}
198-
${{ secrets.CAOS_OPAMP_DEPLOY_KEY }}
199159
- name: Setup Minikube
200160
uses: manusa/actions-setup-minikube@v2.10.0
201161
with:
@@ -243,12 +203,6 @@ jobs:
243203
- uses: actions/checkout@v4
244204
with:
245205
submodules: true
246-
- name: Give GitHub Actions access to private crates
247-
uses: webfactory/ssh-agent@v0.8.0
248-
with:
249-
ssh-private-key: |
250-
${{ secrets.CAOS_OAUTH_DEPLOY_KEY }}
251-
${{ secrets.CAOS_OPAMP_DEPLOY_KEY }}
252206
- name: Setup Minikube
253207
uses: manusa/actions-setup-minikube@v2.10.0
254208
with:

0 commit comments

Comments
 (0)