From 59a69e78392582ebe67b939f192395112ce440d0 Mon Sep 17 00:00:00 2001 From: TC Johnson Date: Sun, 14 Jul 2024 22:13:53 -0500 Subject: [PATCH] Manually set nightly to true in Earthfile to test rest of process --- .gitlab-ci.yml | 6 +++--- Earthfile | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35980df0..5211bb24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -333,7 +333,7 @@ nightly_package_amd64_deb: - build-amd64-deb script: - earthly bootstrap - - earthly +package-linux-amd64-deb --IS_NIGHTLY="$IS_NIGHTLY" + - earthly +package-linux-amd64-deb #--IS_NIGHTLY="$IS_NIGHTLY" - bash scripts/cicd/build-machine/scp-amd64-debs-to-orchestrator.sh rules: - if: '$IS_NIGHTLY == true' @@ -346,7 +346,7 @@ nightly_package_arm64_deb: - build-arm64-deb script: - earthly bootstrap - - earthly +package-linux-arm64-deb --IS_NIGHTLY="$IS_NIGHTLY" + - earthly +package-linux-arm64-deb #--IS_NIGHTLY="$IS_NIGHTLY" - bash scripts/cicd/build-machine/scp-arm64-debs-to-orchestrator.sh rules: - if: '$IS_NIGHTLY == true' @@ -359,7 +359,7 @@ nightly_package_amd64_rpm: - build-amd64-rpm script: - earthly bootstrap - - earthly +package-linux-amd64-rpm --IS_NIGHTLY="$IS_NIGHTLY" + - earthly +package-linux-amd64-rpm #--IS_NIGHTLY="$IS_NIGHTLY" - bash scripts/cicd/build-machine/scp-amd64-rpms-to-orchestrator.sh rules: - if: '$IS_NIGHTLY == true' diff --git a/Earthfile b/Earthfile index d53fbeeb..d3985593 100644 --- a/Earthfile +++ b/Earthfile @@ -212,10 +212,10 @@ package-linux-amd64-deb: ################################# COPY --dir package /veilid # veilid-server - RUN /veilid/package/debian/earthly_make_veilid_server_deb.sh amd64 x86_64-unknown-linux-gnu $IS_NIGHTLY + RUN /veilid/package/debian/earthly_make_veilid_server_deb.sh amd64 x86_64-unknown-linux-gnu true SAVE ARTIFACT --keep-ts /dpkg/out/*.deb AS LOCAL ./target/packages/ # veilid-cli - RUN /veilid/package/debian/earthly_make_veilid_cli_deb.sh amd64 x86_64-unknown-linux-gnu $IS_NIGHTLY + RUN /veilid/package/debian/earthly_make_veilid_cli_deb.sh amd64 x86_64-unknown-linux-gnu true # save artifacts SAVE ARTIFACT --keep-ts /dpkg/out/*.deb AS LOCAL ./target/packages/ @@ -231,10 +231,10 @@ package-linux-amd64-rpm: COPY +build-linux-amd64/x86_64-unknown-linux-gnu /veilid/target/x86_64-unknown-linux-gnu RUN mkdir -p /rpm-work-dir/veilid-server # veilid-server - RUN veilid/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh x86_64 x86_64-unknown-linux-gnu $IS_NIGHTLY + RUN veilid/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh x86_64 x86_64-unknown-linux-gnu true #SAVE ARTIFACT --keep-ts /root/rpmbuild/RPMS/x86_64/*.rpm AS LOCAL ./target/packages/ # veilid-cli - RUN veilid/package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh x86_64 x86_64-unknown-linux-gnu $IS_NIGHTLY + RUN veilid/package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh x86_64 x86_64-unknown-linux-gnu true # save artifacts SAVE ARTIFACT --keep-ts /root/rpmbuild/RPMS/x86_64/*.rpm AS LOCAL ./target/packages/ @@ -245,10 +245,10 @@ package-linux-arm64-deb: ################################# COPY --dir package /veilid # veilid-server - RUN /veilid/package/debian/earthly_make_veilid_server_deb.sh arm64 aarch64-unknown-linux-gnu $IS_NIGHTLY + RUN /veilid/package/debian/earthly_make_veilid_server_deb.sh arm64 aarch64-unknown-linux-gnu true SAVE ARTIFACT --keep-ts /dpkg/out/*.deb AS LOCAL ./target/packages/ # veilid-cli - RUN /veilid/package/debian/earthly_make_veilid_cli_deb.sh arm64 aarch64-unknown-linux-gnu $IS_NIGHTLY + RUN /veilid/package/debian/earthly_make_veilid_cli_deb.sh arm64 aarch64-unknown-linux-gnu true # save artifacts SAVE ARTIFACT --keep-ts /dpkg/out/*.deb AS LOCAL ./target/packages/