From bcf22cb32ff4b5f77fa7226e65b42a6a6f9e3c40 Mon Sep 17 00:00:00 2001 From: tom doron Date: Thu, 10 Mar 2022 22:12:50 -0800 Subject: [PATCH] small cleanup for centos and amazonlinux motivation: cleanup changes: * better name for docker container * group source moving together and sort them --- .../RPM/Amazonlinux/2/docker-compose.yaml | 4 +- .../Linux/RPM/Amazonlinux/2/swiftlang.spec | 50 +++++++++---------- .../Linux/RPM/Centos/7/docker-compose.yaml | 4 +- platforms/Linux/RPM/Centos/7/swiftlang.spec | 50 +++++++++---------- .../Linux/RPM/Centos/8/docker-compose.yaml | 4 +- platforms/Linux/RPM/Centos/8/swiftlang.spec | 50 +++++++++---------- 6 files changed, 75 insertions(+), 87 deletions(-) diff --git a/platforms/Linux/RPM/Amazonlinux/2/docker-compose.yaml b/platforms/Linux/RPM/Amazonlinux/2/docker-compose.yaml index 7c8afe1a..b96d4f08 100644 --- a/platforms/Linux/RPM/Amazonlinux/2/docker-compose.yaml +++ b/platforms/Linux/RPM/Amazonlinux/2/docker-compose.yaml @@ -17,13 +17,13 @@ version: "2" services: docker-setup: - image: amazonlinux2-rpm-builder + image: amazonlinux-2-rpm-builder build: context: . dockerfile: Dockerfile common: &common - image: amazonlinux2-rpm-builder + image: amazonlinux-2-rpm-builder depends_on: [docker-setup] volumes: - .:/code:z diff --git a/platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec b/platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec index ff124520..a84cf9c0 100644 --- a/platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec +++ b/platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec @@ -110,43 +110,39 @@ correct programs easier for the developer. # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary -mv swift-cmark-swift-%{swift_version} cmark -mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation -mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch -mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest -mv swift-integration-tests-swift-%{swift_version} swift-integration-tests -mv swift-llbuild-swift-%{swift_version} llbuild -mv swift-package-manager-swift-%{swift_version} swiftpm -mv swift-swift-%{swift_version} swift -mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support -mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp +mv CMake-%{cmake_version} cmake +mv icu-release-%{icu_version} icu mv indexstore-db-swift-%{swift_version} indexstore-db mv llvm-project-swift-%{swift_version} llvm-project -mv swift-syntax-swift-%{swift_version} swift-syntax -mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core -mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser -mv swift-driver-swift-%{swift_version} swift-driver -mv swift-crypto-%{swift_crypto_version} swift-crypto mv ninja-%{ninja_version} ninja -mv CMake-%{cmake_version} cmake +mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp +mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser mv swift-atomics-%{swift_atomics_version} swift-atomics +mv swift-cmark-swift-%{swift_version} cmark mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm -mv swift-docc-swift-%{swift_version} swift-docc +mv swift-collections-%{swift_collections_version} swift-collections +mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation +mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch +mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest +mv swift-crypto-%{swift_crypto_version} swift-crypto mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact +mv swift-docc-swift-%{swift_version} swift-docc mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit -mv swift-collections-%{swift_collections_version} swift-collections -mv swift-numerics-%{swift_numerics_version} swift-numerics -mv swift-system-%{swift_system_version} swift-system -mv swift-nio-%{swift_nio_version} swift-nio -mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl +mv swift-driver-swift-%{swift_version} swift-driver mv swift-format-swift-%{swift_version} swift-format +mv swift-integration-tests-swift-%{swift_version} swift-integration-tests +mv swift-llbuild-swift-%{swift_version} llbuild mv swift-lmdb-swift-%{swift_version} swift-lmdb mv swift-markdown-swift-%{swift_version} swift-markdown - -# ICU -mv icu-release-%{icu_version} icu - -# Yams +mv swift-nio-%{swift_nio_version} swift-nio +mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl +mv swift-numerics-%{swift_numerics_version} swift-numerics +mv swift-package-manager-swift-%{swift_version} swiftpm +mv swift-swift-%{swift_version} swift +mv swift-syntax-swift-%{swift_version} swift-syntax +mv swift-system-%{swift_system_version} swift-system +mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core +mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support mv Yams-%{yams_version} yams # Adjust python version hwasan_symbolize diff --git a/platforms/Linux/RPM/Centos/7/docker-compose.yaml b/platforms/Linux/RPM/Centos/7/docker-compose.yaml index a112aca5..d03f2680 100644 --- a/platforms/Linux/RPM/Centos/7/docker-compose.yaml +++ b/platforms/Linux/RPM/Centos/7/docker-compose.yaml @@ -17,13 +17,13 @@ version: "2" services: docker-setup: - image: centos7-rpm-builder + image: centos-7-rpm-builder build: context: . dockerfile: Dockerfile common: &common - image: centos7-rpm-builder + image: centos-7-rpm-builder depends_on: [docker-setup] # https://bugs.swift.org/browse/SR-15343 security_opt: diff --git a/platforms/Linux/RPM/Centos/7/swiftlang.spec b/platforms/Linux/RPM/Centos/7/swiftlang.spec index 76fe902e..cacfd065 100644 --- a/platforms/Linux/RPM/Centos/7/swiftlang.spec +++ b/platforms/Linux/RPM/Centos/7/swiftlang.spec @@ -112,43 +112,39 @@ correct programs easier for the developer. # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary -mv swift-cmark-swift-%{swift_version} cmark -mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation -mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch -mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest -mv swift-integration-tests-swift-%{swift_version} swift-integration-tests -mv swift-llbuild-swift-%{swift_version} llbuild -mv swift-package-manager-swift-%{swift_version} swiftpm -mv swift-swift-%{swift_version} swift -mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support -mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp +mv CMake-%{cmake_version} cmake +mv icu-release-%{icu_version} icu mv indexstore-db-swift-%{swift_version} indexstore-db mv llvm-project-swift-%{swift_version} llvm-project -mv swift-syntax-swift-%{swift_version} swift-syntax -mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core -mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser -mv swift-driver-swift-%{swift_version} swift-driver -mv swift-crypto-%{swift_crypto_version} swift-crypto mv ninja-%{ninja_version} ninja -mv CMake-%{cmake_version} cmake +mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp +mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser mv swift-atomics-%{swift_atomics_version} swift-atomics +mv swift-cmark-swift-%{swift_version} cmark mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm -mv swift-docc-swift-%{swift_version} swift-docc +mv swift-collections-%{swift_collections_version} swift-collections +mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation +mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch +mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest +mv swift-crypto-%{swift_crypto_version} swift-crypto mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact +mv swift-docc-swift-%{swift_version} swift-docc mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit -mv swift-collections-%{swift_collections_version} swift-collections -mv swift-numerics-%{swift_numerics_version} swift-numerics -mv swift-system-%{swift_system_version} swift-system -mv swift-nio-%{swift_nio_version} swift-nio -mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl +mv swift-driver-swift-%{swift_version} swift-driver mv swift-format-swift-%{swift_version} swift-format +mv swift-integration-tests-swift-%{swift_version} swift-integration-tests +mv swift-llbuild-swift-%{swift_version} llbuild mv swift-lmdb-swift-%{swift_version} swift-lmdb mv swift-markdown-swift-%{swift_version} swift-markdown - -# ICU -mv icu-release-%{icu_version} icu - -# Yams +mv swift-nio-%{swift_nio_version} swift-nio +mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl +mv swift-numerics-%{swift_numerics_version} swift-numerics +mv swift-package-manager-swift-%{swift_version} swiftpm +mv swift-swift-%{swift_version} swift +mv swift-syntax-swift-%{swift_version} swift-syntax +mv swift-system-%{swift_system_version} swift-system +mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core +mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support mv Yams-%{yams_version} yams # Adjust python version hwasan_symbolize diff --git a/platforms/Linux/RPM/Centos/8/docker-compose.yaml b/platforms/Linux/RPM/Centos/8/docker-compose.yaml index 5b10da45..c7d0c627 100644 --- a/platforms/Linux/RPM/Centos/8/docker-compose.yaml +++ b/platforms/Linux/RPM/Centos/8/docker-compose.yaml @@ -17,13 +17,13 @@ version: "2" services: docker-setup: - image: centos8-rpm-builder + image: centos-8-rpm-builder build: context: . dockerfile: Dockerfile common: &common - image: centos8-rpm-builder + image: centos-8-rpm-builder depends_on: [docker-setup] # https://bugs.swift.org/browse/SR-15343 security_opt: diff --git a/platforms/Linux/RPM/Centos/8/swiftlang.spec b/platforms/Linux/RPM/Centos/8/swiftlang.spec index b3c78127..d64f9416 100644 --- a/platforms/Linux/RPM/Centos/8/swiftlang.spec +++ b/platforms/Linux/RPM/Centos/8/swiftlang.spec @@ -110,43 +110,39 @@ correct programs easier for the developer. # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary -mv swift-cmark-swift-%{swift_version} cmark -mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation -mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch -mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest -mv swift-integration-tests-swift-%{swift_version} swift-integration-tests -mv swift-llbuild-swift-%{swift_version} llbuild -mv swift-package-manager-swift-%{swift_version} swiftpm -mv swift-swift-%{swift_version} swift -mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support -mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp +mv CMake-%{cmake_version} cmake +mv icu-release-%{icu_version} icu mv indexstore-db-swift-%{swift_version} indexstore-db mv llvm-project-swift-%{swift_version} llvm-project -mv swift-syntax-swift-%{swift_version} swift-syntax -mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core -mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser -mv swift-driver-swift-%{swift_version} swift-driver -mv swift-crypto-%{swift_crypto_version} swift-crypto mv ninja-%{ninja_version} ninja -mv CMake-%{cmake_version} cmake +mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp +mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser mv swift-atomics-%{swift_atomics_version} swift-atomics +mv swift-cmark-swift-%{swift_version} cmark mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm -mv swift-docc-swift-%{swift_version} swift-docc +mv swift-collections-%{swift_collections_version} swift-collections +mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation +mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch +mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest +mv swift-crypto-%{swift_crypto_version} swift-crypto mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact +mv swift-docc-swift-%{swift_version} swift-docc mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit -mv swift-collections-%{swift_collections_version} swift-collections -mv swift-numerics-%{swift_numerics_version} swift-numerics -mv swift-system-%{swift_system_version} swift-system -mv swift-nio-%{swift_nio_version} swift-nio -mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl +mv swift-driver-swift-%{swift_version} swift-driver mv swift-format-swift-%{swift_version} swift-format +mv swift-integration-tests-swift-%{swift_version} swift-integration-tests +mv swift-llbuild-swift-%{swift_version} llbuild mv swift-lmdb-swift-%{swift_version} swift-lmdb mv swift-markdown-swift-%{swift_version} swift-markdown - -# ICU -mv icu-release-%{icu_version} icu - -# Yams +mv swift-nio-%{swift_nio_version} swift-nio +mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl +mv swift-numerics-%{swift_numerics_version} swift-numerics +mv swift-package-manager-swift-%{swift_version} swiftpm +mv swift-swift-%{swift_version} swift +mv swift-syntax-swift-%{swift_version} swift-syntax +mv swift-system-%{swift_system_version} swift-system +mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core +mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support mv Yams-%{yams_version} yams # Adjust python version hwasan_symbolize