-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixup! rpm: merge packages and use build script
- Loading branch information
Showing
2 changed files
with
42 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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: | ||
|
|
@@ -181,41 +181,41 @@ jobs: | |
| - get-rpm-repo | ||
| - clone-toolchain | ||
| - shallow-clone: | ||
| ref: merge-packages | ||
| ref: master | ||
| dir: cheerp-internal | ||
| remote: [email protected]:leaningtech/cheerp-internal.git | ||
| - set-up-rpm-workspace | ||
| - run: | ||
| name: Setup tarball | ||
| command: | | ||
| cp -r cheerp-compiler/rpmbuild ~ | ||
| mv cheerp-compiler "cheerp-test-$VERSION_NO" | ||
| tar -czvf "cheerp-test_$VERSION_NO.orig.tar.gz" \ | ||
| "cheerp-test-$VERSION_NO/clang" \ | ||
| "cheerp-test-$VERSION_NO/llvm" \ | ||
| "cheerp-test-$VERSION_NO/cmake" \ | ||
| "cheerp-test-$VERSION_NO/compiler-rt" \ | ||
| "cheerp-test-$VERSION_NO/libcxx" \ | ||
| "cheerp-test-$VERSION_NO/libcxxabi" \ | ||
| "cheerp-test-$VERSION_NO/runtimes" \ | ||
| "cheerp-test-$VERSION_NO/third-party" \ | ||
| "cheerp-test-$VERSION_NO/cheerp-libs" \ | ||
| "cheerp-test-$VERSION_NO/cheerp-musl" \ | ||
| "cheerp-test-$VERSION_NO/cheerp-utils" \ | ||
| "cheerp-test-$VERSION_NO/debian" | ||
| mv cheerp-compiler "cheerp-core-$VERSION_NO" | ||
| tar -czvf "cheerp-core_$VERSION_NO.orig.tar.gz" \ | ||
| "cheerp-core-$VERSION_NO/clang" \ | ||
| "cheerp-core-$VERSION_NO/llvm" \ | ||
| "cheerp-core-$VERSION_NO/cmake" \ | ||
| "cheerp-core-$VERSION_NO/compiler-rt" \ | ||
| "cheerp-core-$VERSION_NO/libcxx" \ | ||
| "cheerp-core-$VERSION_NO/libcxxabi" \ | ||
| "cheerp-core-$VERSION_NO/runtimes" \ | ||
| "cheerp-core-$VERSION_NO/third-party" \ | ||
| "cheerp-core-$VERSION_NO/cheerp-libs" \ | ||
| "cheerp-core-$VERSION_NO/cheerp-musl" \ | ||
| "cheerp-core-$VERSION_NO/cheerp-utils" \ | ||
| "cheerp-core-$VERSION_NO/debian" | ||
| mkdir ~/rpmbuild/SOURCES | ||
| mv -v "cheerp-test_$VERSION_NO.orig.tar.gz" ~/rpmbuild/SOURCES | ||
| mv -v "cheerp-core_$VERSION_NO.orig.tar.gz" ~/rpmbuild/SOURCES | ||
| - run: | ||
| name: Build cheerp-toolchain | ||
| working_directory: ~ | ||
| command: | | ||
| sed -i "s/Version: .*/Version: $VERSION_NO/" ~/rpmbuild/SPECS/cheerp-test.spec | ||
| rpmbuild -ba ~/rpmbuild/SPECS/cheerp-test.spec | ||
| rpm --addsign ~/rpmbuild/RPMS/x86_64/cheerp-test-$VERSION_NO-1.el9.x86_64.rpm | ||
| sed -i "s/Version: .*/Version: $VERSION_NO/" ~/rpmbuild/SPECS/cheerp-core.spec | ||
| rpmbuild -ba ~/rpmbuild/SPECS/cheerp-core.spec | ||
| rpm --addsign ~/rpmbuild/RPMS/x86_64/cheerp-core-$VERSION_NO-1.el9.x86_64.rpm | ||
| - run: | ||
| name: Deploy rpm package | ||
| command: | | ||
| cp ~/rpmbuild/RPMS/x86_64/cheerp-test-$VERSION_NO-1.el9.x86_64.rpm "$REPO_DIR/$CHAN" | ||
| cp ~/rpmbuild/RPMS/x86_64/cheerp-core-$VERSION_NO-1.el9.x86_64.rpm "$REPO_DIR/$CHAN" | ||
| . ~/project/cheerp-internal/tools/releasing/rpm_utils.sh | ||
| repo_update | ||
| - when: | ||
|
|
@@ -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: | ||
|
|
||
2 changes: 1 addition & 1 deletion
2
rpmbuild/SPECS/cheerp-test.spec → rpmbuild/SPECS/cheerp-core.spec
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Name: cheerp-test | ||
| Name: cheerp-core | ||
| Version: 3.0 | ||
| Release: 1%{?dist} | ||
| Summary: A C++ compiler for the web | ||
|
|
||