Skip to content

Commit 018b802

Browse files
ATGardnerATGardner
authored
Merge pull request #337 from codefresh-io/cr-24608-sync-upstream-3.5.6
feat: sync upstream `v3.5.6`
2 parents c9c8c9d + 8b47b5a commit 018b802

Some content is hidden

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

59 files changed

+2167
-420
lines changed

‎.github/workflows/ci-build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
# proposals live only on GH as pure markdown
9898
- '!docs/proposals/**'
9999
# docs scripts & tools from `make docs`
100-
- hack/check-mkdocs.sh
100+
- hack/copy-readme.sh
101101
- hack/check-env-doc.sh
102102
- .markdownlint.yaml
103103
- .mlc_config.json

‎.github/workflows/release.yaml‎

Lines changed: 8 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ jobs:
4646
restore-keys: |
4747
${{ runner.os }}-${{ matrix.platform }}-${{ matrix.target }}-buildx-
4848
49-
## Codefresh - remove dockerhub
50-
# - name: Docker Login
51-
# uses: docker/login-action@v1
52-
# with:
53-
# username: ${{ secrets.DOCKERIO_USERNAME }}
54-
# password: ${{ secrets.DOCKERIO_PASSWORD }}
55-
5649
- name: Docker Login
5750
uses: docker/login-action@v2
5851
with:
@@ -74,15 +67,6 @@ jobs:
7467
tag_suffix=$(echo $PLATFORM | sed -r "s/\//-/g")
7568
image_name="${DOCKERIO_ORG}/${TARGET}:${tag}-${tag_suffix}"
7669
77-
## Codefresh - remove dockerhub
78-
# docker buildx build \
79-
# --cache-from "type=local,src=/tmp/.buildx-cache" \
80-
# --cache-to "type=local,dest=/tmp/.buildx-cache" \
81-
# --output "type=image,push=true" \
82-
# --platform="${PLATFORM}" \
83-
# --target $TARGET \
84-
# --tag $image_name .
85-
8670
docker buildx build \
8771
--cache-from "type=local,src=/tmp/.buildx-cache" \
8872
--cache-to "type=local,dest=/tmp/.buildx-cache" \
@@ -121,13 +105,6 @@ jobs:
121105
restore-keys: |
122106
${{ runner.os }}-${{ matrix.platform }}-${{ matrix.target }}-buildx-
123107
124-
## Codefresh - remove dockerhub
125-
# - name: Docker Login
126-
# uses: docker/login-action@v1
127-
# with:
128-
# username: ${{ secrets.DOCKERIO_USERNAME }}
129-
# password: ${{ secrets.DOCKERIO_PASSWORD }}
130-
131108
- name: Docker Login
132109
uses: docker/login-action@v2
133110
with:
@@ -149,15 +126,6 @@ jobs:
149126
tag_suffix=$(echo $PLATFORM | sed -r "s/\//-/g")
150127
image_name="${DOCKERIO_ORG}/${TARGET}:${tag}-${tag_suffix}"
151128
152-
## Codefresh - remove dockerhub
153-
# docker buildx build \
154-
# --cache-from "type=local,src=/tmp/.buildx-cache" \
155-
# --cache-to "type=local,dest=/tmp/.buildx-cache" \
156-
# --output "type=image,push=true" \
157-
# --platform="${PLATFORM}" \
158-
# --target $TARGET \
159-
# --tag $image_name .
160-
161129
docker buildx build \
162130
--cache-from "type=local,src=/tmp/.buildx-cache" \
163131
--cache-to "type=local,dest=/tmp/.buildx-cache" \
@@ -172,17 +140,11 @@ jobs:
172140
runs-on: windows-2022
173141
steps:
174142
- uses: actions/checkout@v2
175-
## Codefresh - remove dockerhub
176-
# - name: Docker Login
177-
# uses: Azure/docker-login@v1
178-
# with:
179-
# username: ${{ secrets.DOCKERIO_USERNAME }}
180-
# password: ${{ secrets.DOCKERIO_PASSWORD }}
181143

182144
- name: Login to Quay
183-
uses: Azure/docker-login@v1
145+
uses: docker/login-action@v2
184146
with:
185-
login-server: quay.io
147+
registry: quay.io
186148
username: ${{ secrets.QUAYIO_USERNAME }}
187149
password: ${{ secrets.QUAYIO_PASSWORD }}
188150

@@ -215,17 +177,11 @@ jobs:
215177
needs: [ build-linux-amd64, build-linux-arm64, build-windows ]
216178
steps:
217179
- uses: actions/checkout@v2
218-
## Codefresh - remove dockerhub
219-
# - name: Docker Login
220-
# uses: Azure/docker-login@v1
221-
# with:
222-
# username: ${{ secrets.DOCKERIO_USERNAME }}
223-
# password: ${{ secrets.DOCKERIO_PASSWORD }}
224180

225181
- name: Login to Quay
226-
uses: Azure/docker-login@v1
182+
uses: docker/login-action@v2
227183
with:
228-
login-server: quay.io
184+
registry: quay.io
229185
username: ${{ secrets.QUAYIO_USERNAME }}
230186
password: ${{ secrets.QUAYIO_PASSWORD }}
231187

@@ -271,13 +227,6 @@ jobs:
271227
platform: [ linux/amd64 ]
272228
target: [ workflow-controller, argocli, argoexec ]
273229
steps:
274-
## Codefresh - remove dockerhub
275-
# - name: Docker Login
276-
# uses: Azure/docker-login@v1
277-
# with:
278-
# username: ${{ secrets.DOCKERIO_USERNAME }}
279-
# password: ${{ secrets.DOCKERIO_PASSWORD }}
280-
281230
- name: Login to Quay
282231
uses: Azure/docker-login@v1
283232
with:
@@ -297,8 +246,6 @@ jobs:
297246
fi
298247
299248
image_name="${DOCKERIO_ORG}/${TARGET}:${tag}"
300-
## Codefresh - remove dockerhub
301-
# docker pull $image_name
302249
docker pull quay.io/$image_name
303250
304251
test-images-windows:
@@ -307,13 +254,6 @@ jobs:
307254
runs-on: windows-2022
308255
needs: [ push-images ]
309256
steps:
310-
## Codefresh - remove dockerhub
311-
# - name: Docker Login
312-
# uses: Azure/docker-login@v1
313-
# with:
314-
# username: ${{ secrets.DOCKERIO_USERNAME }}
315-
# password: ${{ secrets.DOCKERIO_PASSWORD }}
316-
317257
- name: Login to Quay
318258
uses: Azure/docker-login@v1
319259
with:
@@ -333,8 +273,6 @@ jobs:
333273
targets="argoexec"
334274
for target in $targets; do
335275
image_name="${docker_org}/${target}:${tag}"
336-
## Codefresh - remove dockerhub
337-
# docker pull $image_name
338276
docker pull quay.io/$image_name
339277
done
340278
@@ -358,11 +296,13 @@ jobs:
358296
with:
359297
path: ui/node_modules
360298
key: ${{ runner.os }}-node-dep-v1-${{ hashFiles('**/yarn.lock') }}
361-
- uses: actions/cache@v3
299+
- name: go build cache
300+
uses: actions/cache@v3
362301
with:
363302
path: /home/runner/.cache/go-build
364303
key: GOCACHE-v2-${{ hashFiles('**/go.mod') }}
365-
- uses: actions/cache@v3
304+
- name: go mod cache
305+
uses: actions/cache@v3
366306
with:
367307
path: /home/runner/go/pkg/mod
368308
key: GOMODCACHE-v2-${{ hashFiles('**/go.mod') }}

0 commit comments

Comments
 (0)