equalize build

cloudfoundry · Jul 29, 2023 · ffffd02 · ffffd02
1 parent a5eb887
commit ffffd02
Showing 1 changed file with 44 additions and 132 deletions.
diff --git a/.github/workflows/release-build-sign-upload.yml b/.github/workflows/release-build-sign-upload.yml
@@ -206,6 +206,7 @@ jobs:
         set -ex
         set -o pipefail
 
+        declare -A arch_array=([i686]="32-bit" [x86_64]="64-bit" [aarch64]='aarch/arm-64bit')
         root=$PWD
 
         cat<< EOF >~/.rpmmacros
@@ -216,48 +217,21 @@ jobs:
 
         mkdir -pv $root/packaged
 
-        echo "Build 32-bit RedHat package"
-        (
-          pushd cli-ci/ci/installers/rpm
-        	cp $root/out/cf-cli_linux_i686 cf8
-        	cp ../../license/NOTICE .
-        	cp ../../license/LICENSE-WITH-3RD-PARTY-LICENSES LICENSE
-        	cp ../completion/cf8 cf8.bash
-        	echo "Version: ${RPM_VERSION}" > cf-cli.spec
-        	cat cf8-cli.spec.template >> cf-cli.spec
-        	rpmbuild --target i386 --define "_topdir $(pwd)/build" -bb cf-cli.spec
-        	mv build/RPMS/i386/cf8-cli*.rpm $root/packaged/cf8-cli-installer_${BUILD_VERSION}_i686.rpm
-          popd
-        )
-
-
-        echo "Build 64-bit RedHat package"
-        (
-          pushd cli-ci/ci/installers/rpm
-        	cp $root/out/cf-cli_linux_x86-64 cf8
-        	cp ../../license/NOTICE .
-        	cp ../../license/LICENSE-WITH-3RD-PARTY-LICENSES LICENSE
-        	cp ../completion/cf8 cf8.bash
-        	echo "Version: ${RPM_VERSION}" > cf-cli.spec
-        	cat cf8-cli.spec.template >> cf-cli.spec
-        	rpmbuild --target x86_64 --define "_topdir $(pwd)/build" -bb cf-cli.spec
-        	mv build/RPMS/x86_64/cf8-cli*.rpm $root/packaged/cf8-cli-installer_${BUILD_VERSION}_x86-64.rpm
-          popd
-        )
-
-        echo "Build aarch64 RedHat package"
-        (
-          pushd cli-ci/ci/installers/rpm
-        	cp $root/out/cf-cli_linux_arm64 cf8
-        	cp ../../license/NOTICE .
-        	cp ../../license/LICENSE-WITH-3RD-PARTY-LICENSES LICENSE
-        	cp ../completion/cf8 cf8.bash
-        	echo "Version: ${RPM_VERSION}" > cf-cli.spec
-        	cat cf8-cli.spec.template >> cf-cli.spec
-        	rpmbuild --target aarch64 --define "_topdir $(pwd)/build" -bb cf-cli.spec
-        	mv build/RPMS/aarch64/cf8-cli*.rpm $root/packaged/cf8-cli-installer_${BUILD_VERSION}_aarch64.rpm
-          popd
-        )
+        for arch in "${!arch_array[@]}"; do
+          echo "Build ${arch_array[$arch]} RedHat package"
+          (
+            pushd cli-ci/ci/installers/rpm
+            cp $root/out/cf-cli_linux_$arch cf8
+            cp ../../license/NOTICE .
+            cp ../../license/LICENSE-WITH-3RD-PARTY-LICENSES LICENSE
+            cp ../completion/cf8 cf8.bash
+            echo "Version: ${RPM_VERSION}" > cf-cli.spec
+            cat cf8-cli.spec.template >> cf-cli.spec
+            rpmbuild --target $arch --define "_topdir $(pwd)/build" -bb cf-cli.spec
+            mv build/RPMS/$arch/cf8-cli*.rpm $root/packaged/cf8-cli-installer_${VERSION_BUILD}_${arch}.rpm
+            popd
+          )
+        done
 
     - name: Load GPG key
       env:
@@ -307,107 +281,45 @@ jobs:
         set -ex
         set -o pipefail
 
+        declare -A arch_array=([i686]="32-bit" [x86_64]="64-bit" [arm64]='arm-64bit')
         root=$PWD
 
         mkdir -pv $root/packaged-deb
+        for arch in "${!arch_array[@]}"; do
+          echo "Build ${arch_array[$arch]} Debian package"
+          (
+            SIZE="$(BLOCKSIZE=1000 du $root/out/cf-cli_linux_$arch | cut -f 1)"
 
-        echo "Build 32-bit Debian package"
-        (
-          SIZE="$(BLOCKSIZE=1000 du $root/out/cf-cli_linux_i686 | cut -f 1)"
-
-          pushd cli-ci/ci/installers/deb
-            mkdir -p cf/usr/bin cf/usr/share/doc/cf8-cli/ cf/DEBIAN cf/usr/share/bash-completion/completions
-
-            cp copyright_preamble cf/DEBIAN/copyright
-            sed 's/^$/ ./' $root/LICENSE >> cf/DEBIAN/copyright
-            cat copyright_comment_header >> cf/DEBIAN/copyright
-            sed 's/^$/ ./' ../../license/3RD-PARTY-LICENSES >> cf/DEBIAN/copyright
-
-            cp cf/DEBIAN/copyright cf/usr/share/doc/cf8-cli/copyright
+            pushd cli-ci/ci/installers/deb
+              mkdir -p cf/usr/bin cf/usr/share/doc/cf${VERSION_MAJOR}-cli/ cf/DEBIAN cf/usr/share/bash-completion/completions
 
-            cp ../../license/NOTICE cf/usr/share/doc/cf8-cli
-            cp ../../license/LICENSE-WITH-3RD-PARTY-LICENSES cf/usr/share/doc/cf8-cli/LICENSE
+              cp copyright_preamble cf/DEBIAN/copyright
+              sed 's/^$/ ./' $root/LICENSE >> cf/DEBIAN/copyright
+              cat copyright_comment_header >> cf/DEBIAN/copyright
+              sed 's/^$/ ./' ../../license/3RD-PARTY-LICENSES >> cf/DEBIAN/copyright
 
-            cp control_v8.template cf/DEBIAN/control
-            echo "Installed-Size: ${SIZE}" >> cf/DEBIAN/control
-            echo "Version: ${BUILD_VERSION}" >> cf/DEBIAN/control
-            echo "Architecture: i386" >> cf/DEBIAN/control
+              cp cf/DEBIAN/copyright cf/usr/share/doc/cf${VERSION_MAJOR}-cli/copyright
 
-            cp ../completion/cf8 cf/usr/share/bash-completion/completions/cf8
+              cp ../../license/NOTICE cf/usr/share/doc/cf${VERSION_MAJOR}-cli
+              cp ../../license/LICENSE-WITH-3RD-PARTY-LICENSES cf/usr/share/doc/cf${VERSION_MAJOR}-cli/LICENSE
 
-            cp $root/out/cf-cli_linux_i686 cf/usr/bin/cf8
-            ln -frs cf/usr/bin/cf8 cf/usr/bin/cf
-
-            fakeroot dpkg --build cf cf8-cli-installer_${BUILD_VERSION}_i686.deb
-            mv cf8-cli-installer_${BUILD_VERSION}_i686.deb $root/packaged-deb
-            rm -rf cf
-          popd
-        )
-
-        echo "Build 64-bit Debian package"
-        (
-          SIZE="$(BLOCKSIZE=1000 du $root/out/cf-cli_linux_x86-64 | cut -f 1)"
+              cp control_v${VERSION_MAJOR}.template cf/DEBIAN/control
+              echo "Installed-Size: ${SIZE}" >> cf/DEBIAN/control
+              echo "Version: ${VERSION_BUILD}" >> cf/DEBIAN/control
+              echo "Architecture: $arch" >> cf/DEBIAN/control
 
-          pushd cli-ci/ci/installers/deb
-            mkdir -p cf/usr/bin cf/usr/share/doc/cf8-cli/ cf/DEBIAN cf/usr/share/bash-completion/completions
+              cp ../completion/cf${VERSION_MAJOR} cf/usr/share/bash-completion/completions/cf${VERSION_MAJOR}
 
-            cp copyright_preamble cf/DEBIAN/copyright
-            sed 's/^$/ ./' $root/LICENSE >> cf/DEBIAN/copyright
-            cat copyright_comment_header >> cf/DEBIAN/copyright
-            sed 's/^$/ ./' ../../license/3RD-PARTY-LICENSES >> cf/DEBIAN/copyright
-
-            cp cf/DEBIAN/copyright cf/usr/share/doc/cf8-cli/copyright
-
-            cp ../../license/NOTICE cf/usr/share/doc/cf8-cli
-            cp ../../license/LICENSE-WITH-3RD-PARTY-LICENSES cf/usr/share/doc/cf8-cli/LICENSE
-
-            cp control_v8.template cf/DEBIAN/control
-            echo "Installed-Size: ${SIZE}" >> cf/DEBIAN/control
-            echo "Version: ${BUILD_VERSION}" >> cf/DEBIAN/control
-            echo "Architecture: amd64" >> cf/DEBIAN/control
-
-            cp ../completion/cf8 cf/usr/share/bash-completion/completions/cf8
-
-            cp $root/out/cf-cli_linux_x86-64 cf/usr/bin/cf8
-            ln -frs cf/usr/bin/cf8 cf/usr/bin/cf
-
-            fakeroot dpkg --build cf cf8-cli-installer_${BUILD_VERSION}_x86-64.deb
-            mv cf8-cli-installer_${BUILD_VERSION}_x86-64.deb $root/packaged-deb
-          popd
-        )
-
-        echo "Build arm64 Debian package"
-        (
-          SIZE="$(BLOCKSIZE=1000 du $root/out/cf-cli_linux_arm64 | cut -f 1)"
-
-          pushd cli-ci/ci/installers/deb
-            mkdir -p cf/usr/bin cf/usr/share/doc/cf8-cli/ cf/DEBIAN cf/usr/share/bash-completion/completions
-
-            cp copyright_preamble cf/DEBIAN/copyright
-            sed 's/^$/ ./' $root/LICENSE >> cf/DEBIAN/copyright
-            cat copyright_comment_header >> cf/DEBIAN/copyright
-            sed 's/^$/ ./' ../../license/3RD-PARTY-LICENSES >> cf/DEBIAN/copyright
-
-            cp cf/DEBIAN/copyright cf/usr/share/doc/cf8-cli/copyright
-
-            cp ../../license/NOTICE cf/usr/share/doc/cf8-cli
-            cp ../../license/LICENSE-WITH-3RD-PARTY-LICENSES cf/usr/share/doc/cf8-cli/LICENSE
-
-            cp control_v8.template cf/DEBIAN/control
-            echo "Installed-Size: ${SIZE}" >> cf/DEBIAN/control
-            echo "Version: ${BUILD_VERSION}" >> cf/DEBIAN/control
-            echo "Architecture: arm64" >> cf/DEBIAN/control
-
-            cp ../completion/cf8 cf/usr/share/bash-completion/completions/cf8
-
-            cp $root/out/cf-cli_linux_arm64 cf/usr/bin/cf8
-            ln -frs cf/usr/bin/cf8 cf/usr/bin/cf
-
-            fakeroot dpkg --build cf cf8-cli-installer_${BUILD_VERSION}_arm64.deb
-            mv cf8-cli-installer_${BUILD_VERSION}_arm64.deb $root/packaged-deb
-          popd
-        )
+              cp $root/out/cf-cli_linux_$arch cf/usr/bin/cf${VERSION_MAJOR}
+              ln -frs cf/usr/bin/cf${VERSION_MAJOR} cf/usr/bin/cf
 
+              fakeroot dpkg --build cf cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_${arch}.deb
+              mv cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_${arch}.deb $root/packaged-deb
+              rm -rf cf
+            popd
+          )
+        done
+      
     - name: Print DEB Packages Info
       run: |
         ls -R