equalize update

cloudfoundry · Jul 29, 2023 · acecfd8 · acecfd8
1 parent ffffd02
commit acecfd8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/.github/workflows/release-build-sign-upload.yml b/.github/workflows/release-build-sign-upload.yml
@@ -288,33 +288,33 @@ jobs:
         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)"
+            SIZE="$(BLOCKSIZE=1000 du $root/out/cf-cli_linux_${arch} | cut -f 1)"
 
             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
+              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/cf${VERSION_MAJOR}-cli/copyright
+              cp cf/DEBIAN/copyright cf/usr/share/doc/cf8-cli/copyright
 
-              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 ../../license/NOTICE cf/usr/share/doc/cf8-cli
+              cp ../../license/LICENSE-WITH-3RD-PARTY-LICENSES cf/usr/share/doc/cf8-cli/LICENSE
 
-              cp control_v${VERSION_MAJOR}.template cf/DEBIAN/control
+              cp control_v8.template cf/DEBIAN/control
               echo "Installed-Size: ${SIZE}" >> cf/DEBIAN/control
               echo "Version: ${VERSION_BUILD}" >> cf/DEBIAN/control
               echo "Architecture: $arch" >> cf/DEBIAN/control
 
-              cp ../completion/cf${VERSION_MAJOR} cf/usr/share/bash-completion/completions/cf${VERSION_MAJOR}
+              cp ../completion/cf8 cf/usr/share/bash-completion/completions/cf8
 
-              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
+              cp $root/out/cf-cli_linux_$arch cf/usr/bin/cf8
+              ln -frs cf/usr/bin/cf8 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
+              fakeroot dpkg --build cf cf8-cli-installer_${VERSION_BUILD}_${arch}.deb
+              mv cf8-cli-installer_${VERSION_BUILD}_${arch}.deb $root/packaged-deb
               rm -rf cf
             popd
           )

diff --git a/.github/workflows/release-update-repos.yml b/.github/workflows/release-update-repos.yml
@@ -83,6 +83,12 @@ jobs:
         # Because CLAW always returns 200 we have to check if we got archive
         file cf8-cli-linux-tarball/cf8-cli_${BUILD_VERSION}_linux64.tgz | grep -q gzip || exit 1
 
+        curl -L "https://packages.cloudfoundry.org/stable?release=linuxarm64-binary&version=${BUILD_VERSION}&source=github-rel" \
+          > cf8-cli-linux-tarball/cf8-cli_${BUILD_VERSION}_linuxarm64.tgz
+
+        # Because CLAW always returns 200 we have to check if we got archive
+        file cf8-cli-linux-tarball/cf8-cli_${BUILD_VERSION}_linuxarm64.tgz | grep -q gzip || exit 1
+
         pushd cf8-cli-osx-tarball
           CLI_OSX_SHA256=$(shasum -a 256 cf8-cli_*_osx.tgz | cut -d ' ' -f 1)
         popd
@@ -91,8 +97,13 @@ jobs:
           CLI_LINUX_64_SHA256=$(shasum -a 256 cf8-cli_*_linux64.tgz | cut -d ' ' -f 1)
         popd
 
+        pushd cf8-cli-linux-tarball
+          CLI_LINUX_ARM64_SHA256=$(shasum -a 256 cf8-cli_*_linuxarm64.tgz | cut -d ' ' -f 1)
+        popd
+
         echo "CLI_OSX_SHA256=${CLI_OSX_SHA256}" >> $GITHUB_ENV
         echo "CLI_LINUX_64_SHA256=${CLI_LINUX_64_SHA256}" >> $GITHUB_ENV
+        echo "CLI_LINUX_ARM64_SHA256=${CLI_LINUX_ARM64_SHA256}" >> $GITHUB_ENV
 
     - name: Generate Homebrew formula file
       run: |