Skip to content

Commit 581284a

Browse files
Revert "CI: stop using mirrors list" (#1145)
This reverts commit 79d4525. Removing the mirror completely is by no means the correct solution. The SPDX issue is identified and fixed [1], it was also necessary to include the SPDX_LICENSES content on the task hash calculation. [1] https://git.openembedded.org/openembedded-core/commit/?id=10669f6f615058293671fb16454601580b7b34e9
2 parents 5b5056e + 2838927 commit 581284a

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

.github/actions/compile/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,24 @@ runs:
3939
run: |
4040
mkdir $KAS_WORK_DIR
4141
${{inputs.kas}} dump --resolve-env --resolve-local --resolve-refs \
42-
ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }} > kas-build.yml
42+
ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }} > kas-build.yml
4343
4444
- name: Kas qcom world build
4545
shell: bash
4646
run: |
47-
${{inputs.kas}} build ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}:ci/world.yml
47+
${{inputs.kas}} build ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}:ci/world.yml
4848
ci/kas-container-shell-helper.sh ci/yocto-pybootchartgui.sh
4949
mv $KAS_WORK_DIR/build/buildchart.svg buildchart-world.svg
5050
5151
- name: Kas build images
5252
shell: bash
5353
run: |
54-
${{inputs.kas}} build ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}
54+
${{inputs.kas}} build ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}
5555
ci/kas-container-shell-helper.sh ci/yocto-pybootchartgui.sh
5656
mv $KAS_WORK_DIR/build/buildchart.svg .
5757
5858
if [ "${{ inputs.machine }}" = "qcom-armv8a" ]; then
59-
${{inputs.kas}} build ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}:ci/initramfs-test.yml
59+
${{inputs.kas}} build ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}:ci/initramfs-test.yml
6060
fi
6161
6262
- uses: actions/upload-artifact@v4

ci/mirror.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
2+
3+
header:
4+
version: 14
5+
6+
local_conf_header:
7+
mirror: |
8+
BB_HASHSERVE_UPSTREAM = "wss://hashserv.yoctoproject.org/ws"
9+
SSTATE_MIRRORS = "file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH"

0 commit comments

Comments
 (0)