Skip to content

Commit fc4a174

Browse files
authored
Build fixes (#1319)
* Only x86 * Only x86 * actions/upload-artifact@v4 - updating deprecated action * actions/upload-artifact@v4 - updating deprecated action * actions/upload-artifact@v4 - updating deprecated action * actions/upload-artifact@v4 - updating deprecated action * using installed skopeo instead of a docker image * Revert "Only x86" This reverts commit 0c22963. * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags
1 parent 84a9353 commit fc4a174

File tree

17 files changed

+101
-173
lines changed

17 files changed

+101
-173
lines changed

.github/actions/install_python_and_requirements/action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,5 @@ runs:
4040
shell: bash
4141
working-directory: ${{ github.workspace }}
4242
run: |
43-
python3 -m pip install -r dev-requirements-new.txt --no-index --find-links wheels
43+
python3 -m pip install -r dev-requirements-new.txt --no-index --find-links wheels || echo "Installing from cached wheels failed, trying to install from PyPI"
44+
python3 -m pip install -r dev-requirements-new.txt

.github/workflows/build-container-images.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44
push:
55
branches:
66
- master
7-
tags:
8-
- v*.*.*
97
pull_request:
108
branches:
119
- master

.github/workflows/build-linux-packages.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44
push:
55
branches:
66
- master
7-
tags:
8-
- v*.*.*
97
pull_request:
108
branches:
119
- master

.github/workflows/build-tarball.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44
push:
55
branches:
66
- master
7-
tags:
8-
- v*.*.*
97
pull_request:
108
branches:
119
- master
@@ -38,7 +36,7 @@ jobs:
3836
popd
3937
4038
- name: Save tarball as artifact
41-
uses: actions/upload-artifact@v3
39+
uses: actions/upload-artifact@v4
4240
with:
4341
name: tarball-noarch
4442
path: build

.github/workflows/build-windows-package.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44
push:
55
branches:
66
- master
7-
tags:
8-
- v*.*.*
97
pull_request:
108
branches:
119
- master
@@ -37,7 +35,7 @@ jobs:
3735
run: python build_package.py win32
3836

3937
- name: Save installer as artifact
40-
uses: actions/upload-artifact@v3
38+
uses: actions/upload-artifact@v4
4139
with:
4240
name: windows-msi
4341
path: ScalyrAgentInstaller-*.msi

.github/workflows/codespeed-benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
python benchmarks/scripts/send_microbenchmarks_data_to_codespeed.py --data-path="benchmark_results/*.json" --debug
8282
8383
- name: Store artifacts
84-
uses: actions/upload-artifact@v3
84+
uses: actions/upload-artifact@v4
8585
with:
8686
name: codespeed-micro-benchmarks-${{ matrix.python-version }}
8787
path: |

.github/workflows/reusable-agent-build-container-images.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ jobs:
238238
--output-dir ./build
239239
240240
- name: Save image OCI tarball as artifact
241-
uses: actions/upload-artifact@v3
241+
uses: actions/upload-artifact@v4
242242
with:
243243
name: container-image-tarball-${{ matrix.variant.image_type }}-${{ inputs.builder_name }}
244244
path: build
@@ -325,7 +325,7 @@ jobs:
325325
minikube image load busybox:1.28
326326
327327
- name: Download OCI tarball of the built image.
328-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3
328+
uses: actions/download-artifact@v4
329329
with:
330330
name: container-image-tarball-k8s-${{ inputs.builder_name }}
331331
path: /tmp/image_tarball
@@ -355,7 +355,7 @@ jobs:
355355
fi
356356
357357
- name: Upload Agent k8s Test Docker Image as artifact for debugging purposses
358-
uses: actions/upload-artifact@v3
358+
uses: actions/upload-artifact@v4
359359
with:
360360
name: k8s-image-${{ inputs.builder_name }}
361361
path: build
@@ -667,7 +667,7 @@ jobs:
667667
github_token: "${{ secrets.GITHUB_TOKEN }}"
668668

669669
- name: Download OCI tarball of the built image.
670-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3
670+
uses: actions/download-artifact@v4
671671
with:
672672
name: container-image-tarball-k8s-${{ inputs.builder_name }}
673673
path: /tmp/image_tarball
@@ -874,7 +874,7 @@ jobs:
874874
github_token: "${{ secrets.GITHUB_TOKEN }}"
875875

876876
- name: Download OCI tarball of the built image.
877-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3
877+
uses: actions/download-artifact@v4
878878
with:
879879
name: container-image-tarball-k8s-${{ inputs.builder_name }}
880880
path: /tmp/image_tarball
@@ -906,7 +906,7 @@ jobs:
906906
source ./.circleci/smoketest_k8s.sh scalyr/scalyr-agent-ci-unittest:4 150 no_delete_existing_k8s_objs k8s-image:test
907907
908908
- name: Upload test results
909-
uses: actions/upload-artifact@v3
909+
uses: actions/upload-artifact@v4
910910
with:
911911
name: k8s-smoketest
912912
path: |
@@ -976,7 +976,7 @@ jobs:
976976
uses: crazy-max/ghaction-github-runtime@715c25b40ccc0df9b62bfa8be3ccc57d09dbc4b1
977977

978978
- name: Download OCI tarball of the built image.
979-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3
979+
uses: actions/download-artifact@v4
980980
with:
981981
name: container-image-tarball-${{ matrix.variant.image_type }}-${{ inputs.builder_name }}
982982
path: /tmp/image_tarball
@@ -1007,7 +1007,7 @@ jobs:
10071007
source ./.circleci/smoketest_docker.sh scalyr/scalyr-agent-ci-unittest:4 ${{ matrix.variant.image_type }} ${{ matrix.variant.timeout }} ${{ matrix.variant.image_type }}-${{ inputs.builder_name }}:test
10081008
10091009
- name: Upload test results
1010-
uses: actions/upload-artifact@v3
1010+
uses: actions/upload-artifact@v4
10111011
with:
10121012
name: docker-smoketest-${{ matrix.variant.image_type }}-${{ inputs.builder_name }}
10131013
path: |
@@ -1050,7 +1050,7 @@ jobs:
10501050
python_version: ${{ inputs.python_version }}
10511051

10521052
- name: Download OCI tarball of the built image.
1053-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3
1053+
uses: actions/download-artifact@v4
10541054
with:
10551055
name: container-image-tarball-${{ matrix.variant.image_type }}-${{ inputs.builder_name }}
10561056
path: /tmp/image_tarball
@@ -1079,6 +1079,11 @@ jobs:
10791079
echo "tags=empty" >> "${GITHUB_OUTPUT}"
10801080
fi
10811081
1082+
- name: Set up skopeo
1083+
uses: warjiang/setup-skopeo@latest
1084+
with:
1085+
version: latest
1086+
10821087
- name: Publish image
10831088
if: steps.verify.outputs.tags != 'empty'
10841089
run: |

.github/workflows/reusable-agent-build-linux-packages-new.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ jobs:
160160
--package-type ${{ matrix.variant.package_type }}
161161
162162
- name: Save packages as artifact
163-
uses: actions/upload-artifact@v3
163+
uses: actions/upload-artifact@v4
164164
with:
165-
name: linux-packages-${{ matrix.variant.builder_name }}
165+
name: linux-packages-${{ matrix.variant.builder_name }}-${{ matrix.variant.package_type }}
166166
path: build
167167
retention-days: 1
168168

@@ -212,11 +212,15 @@ jobs:
212212
driver-opts: network=host
213213

214214
- name: Download built packages.
215-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3
215+
uses: actions/download-artifact@v4
216216
with:
217-
name: linux-packages-${{ matrix.test_target.builder }}
217+
name: linux-packages-${{ matrix.test_target.builder }}-${{ matrix.test_target.package_type }}
218218
path: /tmp/packages
219219

220+
- name: Debug - List downloaded packages
221+
run: |
222+
find /tmp/packages
223+
220224
- name: Expose GitHub Runtime To Be Able to Use GHA Cache By Docker.
221225
uses: crazy-max/ghaction-github-runtime@715c25b40ccc0df9b62bfa8be3ccc57d09dbc4b1
222226

.github/workflows/reusable-codespeed-agent-benchmarks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
./benchmarks/scripts/send-log-level-counts-to-codespeed.sh "${{ github.sha }}"
155155
156156
- name: Upload log artifacts
157-
uses: actions/upload-artifact@v3
157+
uses: actions/upload-artifact@v4
158158
with:
159159
name: agent-logs-${{ inputs.agent_server_host }}
160160
path: |

.github/workflows/unittests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
KIND: unittests
8989

9090
- name: Upload pytest test results
91-
uses: actions/upload-artifact@v3
91+
uses: actions/upload-artifact@v4
9292
with:
9393
name: pytest-results-${{ matrix.python-version }}-${{ matrix.platform }}
9494
path: |
@@ -153,7 +153,7 @@ jobs:
153153
AGENT_HOST_NAME: monitors-test-${{ github.run_number }}
154154

155155
- name: Upload pytest test results
156-
uses: actions/upload-artifact@v3
156+
uses: actions/upload-artifact@v4
157157
with:
158158
name: pytest-results-${{ matrix.python-version }}-monitor-smoketests
159159
path: |
@@ -228,7 +228,7 @@ jobs:
228228
KIND: end2end
229229

230230
- name: Upload pytest test results
231-
uses: actions/upload-artifact@v3
231+
uses: actions/upload-artifact@v4
232232
with:
233233
name: pytest-results-${{ matrix.python-version }}-${{ matrix.variant }}
234234
path: |
@@ -247,7 +247,7 @@ jobs:
247247
- monitor-smoketests
248248
steps:
249249
- name: Download test results
250-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3
250+
uses: actions/download-artifact@v4
251251
with:
252252
path: reports
253253
- name: Publish Test Results

0 commit comments

Comments
 (0)