From d4502721fbc87614ee1ea9dfa51e38a045f42f15 Mon Sep 17 00:00:00 2001 From: Hyxogen <8938732+Hyxogen@users.noreply.github.com> Date: Tue, 23 Jan 2024 14:30:49 +0100 Subject: [PATCH] fixup! ci/debian: merge binary packages into one --- .circleci/config.yml | 48 ++++++++++++++++++++++---------------------- debian/changelog | 2 +- debian/control | 4 ++-- debian/rules | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f3e964c7a7d..26b238b793f4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -51,7 +51,7 @@ jobs: dch -b -v "$VERSION_NO-1" "Internal build" -m dpkg-buildpackage -d -b mkdir -p ~/project/packages - mv -v ../cheerp-test_*.deb ~/project/packages + mv -v ../cheerp-core_*.deb ~/project/packages - save_cache: name: Save ccache key: cheerp-compiler-<< pipeline.git.branch >>-{{ epoch }} @@ -65,7 +65,7 @@ jobs: root: ~/project/packages paths: - cheerp-build.tar.bz2 - - cheerp-test_*.deb + - cheerp-core_*.deb llvm-check: parameters: rule: @@ -275,28 +275,28 @@ jobs: name: Create tarballs working_directory: cheerp-compiler command: | - tar -czvf ~/project/packages/cheerp-test_$VERSION_NO.orig-cheerp-libs.tar.gz cheerp-libs/ - tar -czvf ~/project/packages/cheerp-test_$VERSION_NO.orig-cheerp-musl.tar.gz cheerp-musl/ - tar -czvf ~/project/packages/cheerp-test_$VERSION_NO.orig-cheerp-utils.tar.gz cheerp-utils/ - tar -czvf ~/project/packages/cheerp-test_$VERSION_NO.orig.tar.gz clang/ llvm/ cmake/ compiler-rt/ libcxx/ libcxxabi/ \ + tar -czvf ~/project/packages/cheerp-core_$VERSION_NO.orig-cheerp-libs.tar.gz cheerp-libs/ + tar -czvf ~/project/packages/cheerp-core_$VERSION_NO.orig-cheerp-musl.tar.gz cheerp-musl/ + tar -czvf ~/project/packages/cheerp-core_$VERSION_NO.orig-cheerp-utils.tar.gz cheerp-utils/ + tar -czvf ~/project/packages/cheerp-core_$VERSION_NO.orig.tar.gz clang/ llvm/ cmake/ compiler-rt/ libcxx/ libcxxabi/ \ runtimes/ third-party/ debian/ - run: name: Package cheerp toolchain command: | rm -rf cheerp-compiler/ - cp ~/project/packages/cheerp-test_$VERSION_NO.orig-cheerp-libs.tar.gz . - cp ~/project/packages/cheerp-test_$VERSION_NO.orig-cheerp-musl.tar.gz . - cp ~/project/packages/cheerp-test_$VERSION_NO.orig-cheerp-utils.tar.gz . - cp ~/project/packages/cheerp-test_$VERSION_NO.orig.tar.gz . + cp ~/project/packages/cheerp-core_$VERSION_NO.orig-cheerp-libs.tar.gz . + cp ~/project/packages/cheerp-core_$VERSION_NO.orig-cheerp-musl.tar.gz . + cp ~/project/packages/cheerp-core_$VERSION_NO.orig-cheerp-utils.tar.gz . + cp ~/project/packages/cheerp-core_$VERSION_NO.orig.tar.gz . - mkdir "cheerp-test-$VERSION_NO" - cd "cheerp-test-$VERSION_NO" + mkdir "cheerp-core-$VERSION_NO" + cd "cheerp-core-$VERSION_NO" - tar -xvf ../cheerp-test_$VERSION_NO.orig-cheerp-libs.tar.gz - tar -xvf ../cheerp-test_$VERSION_NO.orig-cheerp-musl.tar.gz - tar -xvf ../cheerp-test_$VERSION_NO.orig-cheerp-utils.tar.gz - tar -xvf ../cheerp-test_$VERSION_NO.orig.tar.gz + tar -xvf ../cheerp-core_$VERSION_NO.orig-cheerp-libs.tar.gz + tar -xvf ../cheerp-core_$VERSION_NO.orig-cheerp-musl.tar.gz + tar -xvf ../cheerp-core_$VERSION_NO.orig-cheerp-utils.tar.gz + tar -xvf ../cheerp-core_$VERSION_NO.orig.tar.gz dch -D ${DISTRO} -b -v ${VERSION_NO}-1~${DISTRO} "${CHANGELOG_MESSAGE}" -m env -i HOME="$HOME" LC_CTYPE="${LC_ALL:-${LC_CTYPE:-$LANG}}" PATH="$PATH" USER="$USER" debuild -sa -S -kB5208673E6848661 --lintian-opts -v @@ -306,10 +306,10 @@ jobs: - run: name: Publish command: | - dput "$PPA" cheerp-test_*.changes + dput "$PPA" cheerp-core_*.changes if [ << pipeline.parameters.release-tag >> != 'master' ]; then - cp cheerp-test_${VERSION_NO}.orig.tar.gz cheerp-test-${VERSION_NO}.tar.gz - python3 ../cheerp-internal/tools/releasing/github_upload.py << pipeline.parameters.release-tag >> "Cheerp ${VERSION_NO}" cheerp-test-${VERSION_NO}.tar.gz cheerp-test-${VERSION_NO}.tar.gz + cp cheerp-core_${VERSION_NO}.orig.tar.gz cheerp-core-${VERSION_NO}.tar.gz + python3 ../cheerp-internal/tools/releasing/github_upload.py << pipeline.parameters.release-tag >> "Cheerp ${VERSION_NO}" cheerp-core-${VERSION_NO}.tar.gz cheerp-core-${VERSION_NO}.tar.gz fi build-cheerp-headers-and-libs: executor: cheerp-medium @@ -628,7 +628,7 @@ jobs: name: Make package for linux working_directory: ~/project/linux command: | - dpkg -x ~/project/packages/cheerp-test_${VERSION_NO}-*.deb . + dpkg -x ~/project/packages/cheerp-core_${VERSION_NO}-*.deb . tar -C opt/cheerp -xf ~/project/packages/cheerp-headers-and-libs-${VERSION_NO}-proprietary.tar.bz2 cp -v ~/project/cheerp-internal/tools/releasing/LICENSE.TXT.cheerp-llvm-clang.proprietary opt/cheerp/LICENSE.TXT-cheerp-llvm-clang - run: @@ -852,7 +852,7 @@ commands: at: packages - run: name: Install cheerp toolchain - command: dpkg -i ~/project/packages/cheerp-test_*.deb + command: dpkg -i ~/project/packages/cheerp-core_*.deb add-yum-configuration: steps: - run: @@ -1002,7 +1002,7 @@ workflows: - llvm-check filters: branches: - only: [master, merge-packages] + only: master - PPA: requires: - define-version-no @@ -1011,13 +1011,13 @@ workflows: - llvm-check filters: branches: - only: [master, merge-packages] + only: master - build-cheerp-headers-and-libs: requires: - build-cheerp-toolchain filters: branches: - only: [master, merge-packages] + only: master - build-macos: requires: - build-cheerp-headers-and-libs diff --git a/debian/changelog b/debian/changelog index 64155da39a87..3a9f8f891ea1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -cheerp-test (3.0-1) focal; urgency=medium +cheerp-core (3.0-1) focal; urgency=medium * New release diff --git a/debian/control b/debian/control index c85e06cd38f7..5d103e9e3ed9 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,11 @@ -Source: cheerp-test +Source: cheerp-core Maintainer: Alessandro Pignotti Section: devel Priority: optional Standards-Version: 3.9.2 Build-Depends: debhelper (>=8), cmake, python3, python3-distutils, ninja-build, clang, lld, git -Package: cheerp-test +Package: cheerp-core Architecture: i386 amd64 arm64 Depends: ${shlibs:Depends}, ${misc:Depends} Description: A C++ compiler for the Web diff --git a/debian/rules b/debian/rules index 4056e5d48397..054c2df48f59 100755 --- a/debian/rules +++ b/debian/rules @@ -7,4 +7,4 @@ override_dh_auto_build: ./debian/build.sh all override_dh_auto_install: - CHEERP_DEST=$$(pwd)/debian/cheerp-test ./debian/build.sh install + CHEERP_DEST=$$(pwd)/debian/cheerp-core ./debian/build.sh install