.github: Use new location for manifests

This commit is contained in:
Krzesimir Nowak 2023-10-24 17:31:05 +02:00
parent 46461e3fee
commit 6843fb701e
5 changed files with 11 additions and 11 deletions

View File

@ -116,7 +116,7 @@ jobs:
# This is also done again in run-kola-tests.yaml because these changes here disappear
source ci-automation/ci_automation_common.sh
source sdk_container/.repo/manifests/version.txt
source manifests/version.txt
version="alpha-$FLATCAR_VERSION_ID"
check_version_string "$version"
@ -196,7 +196,7 @@ jobs:
source ci-automation/image_changes.sh
channel=alpha
vernum=$(source sdk_container/.repo/manifests/version.txt; echo "${FLATCAR_VERSION}")
vernum=$(source manifests/version.txt; echo "${FLATCAR_VERSION}")
board="${arch}-usr"
package_diff_env=(

View File

@ -63,9 +63,9 @@ jobs:
set -euo pipefail
set -x
commit=${{ steps.fetch-latest-mantle.outputs.COMMIT }}
if ! grep -q "ghcr.io/flatcar/mantle:git-${commit}" sdk_container/.repo/manifests/mantle-container; then
echo "ghcr.io/flatcar/mantle:git-${commit}" > sdk_container/.repo/manifests/mantle-container
git add sdk_container/.repo/manifests/mantle-container
if ! grep -q "ghcr.io/flatcar/mantle:git-${commit}" manifests/mantle-container; then
echo "ghcr.io/flatcar/mantle:git-${commit}" > manifests/mantle-container
git add manifests/mantle-container
fi
- name: Create pull request for branch
if: ${{ steps.figure-out-branch.outputs.SKIP == 0 }}

View File

@ -179,7 +179,7 @@ jobs:
pushd scripts
source ci-automation/ci_automation_common.sh
source sdk_container/.repo/manifests/version.txt
source manifests/version.txt
version="alpha-$FLATCAR_VERSION_ID"
check_version_string "$version"
@ -324,7 +324,7 @@ jobs:
done
done
source sdk_container/.repo/manifests/version.txt
source manifests/version.txt
tap_generate_report "${all_archs}" "${FLATCAR_VERSION}" "md" "true" > test-results.md
cat test-results.md >> "$GITHUB_STEP_SUMMARY"

View File

@ -24,7 +24,7 @@ sudo apt-get install -y docker-ce docker-ce-cli containerd.io \
pushd "${WORK_SCRIPTS_DIR}"
source ci-automation/ci_automation_common.sh
source sdk_container/.repo/manifests/version.txt
source manifests/version.txt
# run_sdk_container requires a tag to exist in the repo it resides,
# which may not be the case for forked repos. Add some fake tag in

View File

@ -93,7 +93,7 @@ jobs:
set -euo pipefail
source ci-automation/ci_automation_common.sh
source sdk_container/.repo/manifests/version.txt
source manifests/version.txt
version="alpha-$FLATCAR_VERSION_ID"
sdk_version="${SOURCE_SDK_VERSION:-$FLATCAR_SDK_VERSION}"
@ -124,7 +124,7 @@ jobs:
echo "setting sdk_version=${target_version} as a github output"
echo "sdk_version=${target_version}" >> "$GITHUB_OUTPUT"
# This also updates sdk_container/.repo/manifests/version.txt with the new SDK version.
# This also updates manifests/version.txt with the new SDK version.
./update_sdk_container_image "${target_version}"
- name: Upload the SDK container and binary packages to bincache
@ -144,7 +144,7 @@ jobs:
echo " User ${BUILDCACHE_USER}" >> ~/.ssh/config
echo " IdentityFile ~/.ssh/bincache" >> ~/.ssh/config
source sdk_container/.repo/manifests/version.txt
source manifests/version.txt
vernum="${FLATCAR_SDK_VERSION}"
docker_vernum="$(vernum_to_docker_image_version "${vernum}")"