Skip to content

Commit bcf22cb

Browse files
tomerdtomerd
committed
small cleanup for centos and amazonlinux
motivation: cleanup changes: * better name for docker container * group source moving together and sort them
1 parent f0a01b3 commit bcf22cb

File tree

6 files changed

+75
-87
lines changed

6 files changed

+75
-87
lines changed

‎platforms/Linux/RPM/Amazonlinux/2/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ version: "2"
1717
services:
1818

1919
docker-setup:
20-
image: amazonlinux2-rpm-builder
20+
image: amazonlinux-2-rpm-builder
2121
build:
2222
context: .
2323
dockerfile: Dockerfile
2424

2525
common: &common
26-
image: amazonlinux2-rpm-builder
26+
image: amazonlinux-2-rpm-builder
2727
depends_on: [docker-setup]
2828
volumes:
2929
- .:/code:z

‎platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -110,43 +110,39 @@ correct programs easier for the developer.
110110
# The Swift build script requires directories to be named
111111
# in a specific way so renaming the source directories is
112112
# necessary
113-
mv swift-cmark-swift-%{swift_version} cmark
114-
mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation
115-
mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch
116-
mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest
117-
mv swift-integration-tests-swift-%{swift_version} swift-integration-tests
118-
mv swift-llbuild-swift-%{swift_version} llbuild
119-
mv swift-package-manager-swift-%{swift_version} swiftpm
120-
mv swift-swift-%{swift_version} swift
121-
mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support
122-
mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp
113+
mv CMake-%{cmake_version} cmake
114+
mv icu-release-%{icu_version} icu
123115
mv indexstore-db-swift-%{swift_version} indexstore-db
124116
mv llvm-project-swift-%{swift_version} llvm-project
125-
mv swift-syntax-swift-%{swift_version} swift-syntax
126-
mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core
127-
mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser
128-
mv swift-driver-swift-%{swift_version} swift-driver
129-
mv swift-crypto-%{swift_crypto_version} swift-crypto
130117
mv ninja-%{ninja_version} ninja
131-
mv CMake-%{cmake_version} cmake
118+
mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp
119+
mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser
132120
mv swift-atomics-%{swift_atomics_version} swift-atomics
121+
mv swift-cmark-swift-%{swift_version} cmark
133122
mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm
134-
mv swift-docc-swift-%{swift_version} swift-docc
123+
mv swift-collections-%{swift_collections_version} swift-collections
124+
mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation
125+
mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch
126+
mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest
127+
mv swift-crypto-%{swift_crypto_version} swift-crypto
135128
mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact
129+
mv swift-docc-swift-%{swift_version} swift-docc
136130
mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit
137-
mv swift-collections-%{swift_collections_version} swift-collections
138-
mv swift-numerics-%{swift_numerics_version} swift-numerics
139-
mv swift-system-%{swift_system_version} swift-system
140-
mv swift-nio-%{swift_nio_version} swift-nio
141-
mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl
131+
mv swift-driver-swift-%{swift_version} swift-driver
142132
mv swift-format-swift-%{swift_version} swift-format
133+
mv swift-integration-tests-swift-%{swift_version} swift-integration-tests
134+
mv swift-llbuild-swift-%{swift_version} llbuild
143135
mv swift-lmdb-swift-%{swift_version} swift-lmdb
144136
mv swift-markdown-swift-%{swift_version} swift-markdown
145-
146-
# ICU
147-
mv icu-release-%{icu_version} icu
148-
149-
# Yams
137+
mv swift-nio-%{swift_nio_version} swift-nio
138+
mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl
139+
mv swift-numerics-%{swift_numerics_version} swift-numerics
140+
mv swift-package-manager-swift-%{swift_version} swiftpm
141+
mv swift-swift-%{swift_version} swift
142+
mv swift-syntax-swift-%{swift_version} swift-syntax
143+
mv swift-system-%{swift_system_version} swift-system
144+
mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core
145+
mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support
150146
mv Yams-%{yams_version} yams
151147

152148
# Adjust python version hwasan_symbolize

‎platforms/Linux/RPM/Centos/7/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ version: "2"
1717
services:
1818

1919
docker-setup:
20-
image: centos7-rpm-builder
20+
image: centos-7-rpm-builder
2121
build:
2222
context: .
2323
dockerfile: Dockerfile
2424

2525
common: &common
26-
image: centos7-rpm-builder
26+
image: centos-7-rpm-builder
2727
depends_on: [docker-setup]
2828
# https://bugs.swift.org/browse/SR-15343
2929
security_opt:

‎platforms/Linux/RPM/Centos/7/swiftlang.spec

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -112,43 +112,39 @@ correct programs easier for the developer.
112112
# The Swift build script requires directories to be named
113113
# in a specific way so renaming the source directories is
114114
# necessary
115-
mv swift-cmark-swift-%{swift_version} cmark
116-
mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation
117-
mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch
118-
mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest
119-
mv swift-integration-tests-swift-%{swift_version} swift-integration-tests
120-
mv swift-llbuild-swift-%{swift_version} llbuild
121-
mv swift-package-manager-swift-%{swift_version} swiftpm
122-
mv swift-swift-%{swift_version} swift
123-
mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support
124-
mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp
115+
mv CMake-%{cmake_version} cmake
116+
mv icu-release-%{icu_version} icu
125117
mv indexstore-db-swift-%{swift_version} indexstore-db
126118
mv llvm-project-swift-%{swift_version} llvm-project
127-
mv swift-syntax-swift-%{swift_version} swift-syntax
128-
mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core
129-
mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser
130-
mv swift-driver-swift-%{swift_version} swift-driver
131-
mv swift-crypto-%{swift_crypto_version} swift-crypto
132119
mv ninja-%{ninja_version} ninja
133-
mv CMake-%{cmake_version} cmake
120+
mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp
121+
mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser
134122
mv swift-atomics-%{swift_atomics_version} swift-atomics
123+
mv swift-cmark-swift-%{swift_version} cmark
135124
mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm
136-
mv swift-docc-swift-%{swift_version} swift-docc
125+
mv swift-collections-%{swift_collections_version} swift-collections
126+
mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation
127+
mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch
128+
mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest
129+
mv swift-crypto-%{swift_crypto_version} swift-crypto
137130
mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact
131+
mv swift-docc-swift-%{swift_version} swift-docc
138132
mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit
139-
mv swift-collections-%{swift_collections_version} swift-collections
140-
mv swift-numerics-%{swift_numerics_version} swift-numerics
141-
mv swift-system-%{swift_system_version} swift-system
142-
mv swift-nio-%{swift_nio_version} swift-nio
143-
mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl
133+
mv swift-driver-swift-%{swift_version} swift-driver
144134
mv swift-format-swift-%{swift_version} swift-format
135+
mv swift-integration-tests-swift-%{swift_version} swift-integration-tests
136+
mv swift-llbuild-swift-%{swift_version} llbuild
145137
mv swift-lmdb-swift-%{swift_version} swift-lmdb
146138
mv swift-markdown-swift-%{swift_version} swift-markdown
147-
148-
# ICU
149-
mv icu-release-%{icu_version} icu
150-
151-
# Yams
139+
mv swift-nio-%{swift_nio_version} swift-nio
140+
mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl
141+
mv swift-numerics-%{swift_numerics_version} swift-numerics
142+
mv swift-package-manager-swift-%{swift_version} swiftpm
143+
mv swift-swift-%{swift_version} swift
144+
mv swift-syntax-swift-%{swift_version} swift-syntax
145+
mv swift-system-%{swift_system_version} swift-system
146+
mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core
147+
mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support
152148
mv Yams-%{yams_version} yams
153149

154150
# Adjust python version hwasan_symbolize

‎platforms/Linux/RPM/Centos/8/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ version: "2"
1717
services:
1818

1919
docker-setup:
20-
image: centos8-rpm-builder
20+
image: centos-8-rpm-builder
2121
build:
2222
context: .
2323
dockerfile: Dockerfile
2424

2525
common: &common
26-
image: centos8-rpm-builder
26+
image: centos-8-rpm-builder
2727
depends_on: [docker-setup]
2828
# https://bugs.swift.org/browse/SR-15343
2929
security_opt:

‎platforms/Linux/RPM/Centos/8/swiftlang.spec

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -110,43 +110,39 @@ correct programs easier for the developer.
110110
# The Swift build script requires directories to be named
111111
# in a specific way so renaming the source directories is
112112
# necessary
113-
mv swift-cmark-swift-%{swift_version} cmark
114-
mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation
115-
mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch
116-
mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest
117-
mv swift-integration-tests-swift-%{swift_version} swift-integration-tests
118-
mv swift-llbuild-swift-%{swift_version} llbuild
119-
mv swift-package-manager-swift-%{swift_version} swiftpm
120-
mv swift-swift-%{swift_version} swift
121-
mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support
122-
mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp
113+
mv CMake-%{cmake_version} cmake
114+
mv icu-release-%{icu_version} icu
123115
mv indexstore-db-swift-%{swift_version} indexstore-db
124116
mv llvm-project-swift-%{swift_version} llvm-project
125-
mv swift-syntax-swift-%{swift_version} swift-syntax
126-
mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core
127-
mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser
128-
mv swift-driver-swift-%{swift_version} swift-driver
129-
mv swift-crypto-%{swift_crypto_version} swift-crypto
130117
mv ninja-%{ninja_version} ninja
131-
mv CMake-%{cmake_version} cmake
118+
mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp
119+
mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser
132120
mv swift-atomics-%{swift_atomics_version} swift-atomics
121+
mv swift-cmark-swift-%{swift_version} cmark
133122
mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm
134-
mv swift-docc-swift-%{swift_version} swift-docc
123+
mv swift-collections-%{swift_collections_version} swift-collections
124+
mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation
125+
mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch
126+
mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest
127+
mv swift-crypto-%{swift_crypto_version} swift-crypto
135128
mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact
129+
mv swift-docc-swift-%{swift_version} swift-docc
136130
mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit
137-
mv swift-collections-%{swift_collections_version} swift-collections
138-
mv swift-numerics-%{swift_numerics_version} swift-numerics
139-
mv swift-system-%{swift_system_version} swift-system
140-
mv swift-nio-%{swift_nio_version} swift-nio
141-
mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl
131+
mv swift-driver-swift-%{swift_version} swift-driver
142132
mv swift-format-swift-%{swift_version} swift-format
133+
mv swift-integration-tests-swift-%{swift_version} swift-integration-tests
134+
mv swift-llbuild-swift-%{swift_version} llbuild
143135
mv swift-lmdb-swift-%{swift_version} swift-lmdb
144136
mv swift-markdown-swift-%{swift_version} swift-markdown
145-
146-
# ICU
147-
mv icu-release-%{icu_version} icu
148-
149-
# Yams
137+
mv swift-nio-%{swift_nio_version} swift-nio
138+
mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl
139+
mv swift-numerics-%{swift_numerics_version} swift-numerics
140+
mv swift-package-manager-swift-%{swift_version} swiftpm
141+
mv swift-swift-%{swift_version} swift
142+
mv swift-syntax-swift-%{swift_version} swift-syntax
143+
mv swift-system-%{swift_system_version} swift-system
144+
mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core
145+
mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support
150146
mv Yams-%{yams_version} yams
151147

152148
# Adjust python version hwasan_symbolize

0 commit comments

Comments
 (0)