diff options
| author | Tom Rini <trini@konsulko.com> | 2024-03-11 13:40:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-03-11 15:27:20 -0400 |
| commit | 20a0ce574d6642e0dfe651467159039fac48cc4f (patch) | |
| tree | 9a76dcd90a2e27e65963b4a74d1621cd10fe91f0 /.gitlab-ci.yml | |
| parent | beedf675b36841ce1e077779157a87a6505317e6 (diff) | |
| parent | f3c979dd0053c082d2df170446923e7ce5edbc2d (diff) | |
| download | u-boot-20a0ce574d6642e0dfe651467159039fac48cc4f.tar.gz u-boot-20a0ce574d6642e0dfe651467159039fac48cc4f.tar.bz2 u-boot-20a0ce574d6642e0dfe651467159039fac48cc4f.zip | |
Merge tag 'v2024.04-rc4' into next
Prepare v2024.04-rc4
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8bfbadd6c8..b23ece3887 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ default: # Grab our configured image. The source for this is found # in the u-boot tree at tools/docker/Dockerfile -image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20240111-17Jan2024 +image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20240125-12Feb2024 # We run some tests in different order, to catch some failures quicker. stages: @@ -70,14 +70,9 @@ stages: cp images/spi-nor.img ${UBOOT_TRAVIS_BUILD_DIR}/; fi - if [[ "${TEST_PY_BD}" == "coreboot" ]]; then - wget -O - - "https://drive.google.com/uc?id=1uJ2VkUQ8czWFZmhJQ90Tp8V_zrJ6BrBH&export=download" | - xz -dc >${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom; - wget -O - - "https://drive.google.com/uc?id=149Cz-5SZXHNKpi9xg6R_5XITWohu348y&export=download" > - cbfstool; - chmod a+x cbfstool; - ./cbfstool ${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom add-flat-binary -f ${UBOOT_TRAVIS_BUILD_DIR}/u-boot.bin -n fallback/payload -c LZMA -l 0x1110000 -e 0x1110000; + cp /opt/coreboot/coreboot.rom ${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom; + /opt/coreboot/cbfstool ${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom remove -n fallback/payload; + /opt/coreboot/cbfstool ${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom add-flat-binary -f ${UBOOT_TRAVIS_BUILD_DIR}/u-boot.bin -n fallback/payload -c LZMA -l 0x1110000 -e 0x1110000; fi - virtualenv -p /usr/bin/python3 /tmp/venv - . /tmp/venv/bin/activate |