libzstd-devel removed.

Author: syslogic

.github/workflows/reusable-docker.yml

@@ -78,11 +78,11 @@ jobs:
         run: |
           PLATFORM='${{ INPUTS.PLATFORM }}'
           ARTIFACT_NAME=${GITHUB_REPOSITORY#$GITHUB_REPOSITORY_OWNER/}-rhel9-${PLATFORM#linux/}-unsigned
-          echo "CACHE_PATH=${{ RUNNER.TEMP }}/.cache" >> $GITHUB_OUTPUT
-          echo "ARTIFACT_PATH=${{ RUNNER.TEMP }}/.rpms" >> $GITHUB_OUTPUT
           echo "ARTIFACT_NAME=${ARTIFACT_NAME}" >> $GITHUB_OUTPUT
+          echo "ARTIFACT_PATH=${{ RUNNER.TEMP }}/.rpms" >> $GITHUB_OUTPUT
+          echo "CACHE_PATH=${{ RUNNER.TEMP }}/.cache" >> $GITHUB_OUTPUT
           echo "::group::Setup Info"
-          echo "::notice file=reusable-docker.yml,line={83},title=Artifact Name: ${ARTIFACT_NAME}"
+          echo "::notice file=reusable-docker.yml,line={85},title=Artifact Name: ${ARTIFACT_NAME}"
           echo "::endgroup::"
 
       # https://github.com/docker/login-action
@@ -111,10 +111,10 @@ jobs:
         id: build-rpm-packages
         shell: bash
         env:
-          VOLUMES: '--volume ${{ RUNNER.TEMP }}/.cache:/home/runner/.cache --volume ${{ RUNNER.TEMP }}/.rpms:/home/runner/.rpms'
+          VOLUMES: '--volume ${{ STEPS.SETUP.OUTPUTS.CACHE_PATH }}:/home/runner/.cache --volume ${{ STEPS.SETUP.OUTPUTS.ARTIFACT_PATH }}:/home/runner/.rpms'
         run: |
-          mkdir -p ${{ STEPS.SETUP.OUTPUTS.ARTIFACT_PATH }}
           mkdir -p ${{ STEPS.SETUP.OUTPUTS.CACHE_PATH }}
+          mkdir -p ${{ STEPS.SETUP.OUTPUTS.ARTIFACT_PATH }}
           docker run $DOCKER_OPTIONS $VOLUMES $ENV_VARS $DOCKER_IMAGE
 
       # https://github.com/actions/upload-artifact
@@ -134,7 +134,7 @@ jobs:
         run: |
           if [ "$(ls -1 ${{ STEPS.SETUP.OUTPUTS.ARTIFACT_PATH }}/*.rpm 2>/dev/null | wc -l)" -lt 4 ]; then
             echo "::warning file=reusable-docker.yml,line=134,title=RPM Build::Less than the expected 4 RPM packages were built."
-            # for FILE in ${{ STEPS.SETUP.OUTPUTS.ARTIFACT_PATH }}/*.rpm; do echo "::notice file=reusable-docker.yml,line=136,title=${FILE}"; done
+            for package in ${{ STEPS.SETUP.OUTPUTS.ARTIFACT_PATH }}/*.rpm; do echo "::notice file=reusable-docker.yml,line=136,title=${package}"; done
           fi
           echo "Ubuntu mount-point: ${{ STEPS.SETUP.OUTPUTS.ARTIFACT_PATH }}"
           ls -la ${{ STEPS.SETUP.OUTPUTS.ARTIFACT_PATH }}
@@ -145,5 +145,5 @@ jobs:
         id: bazel-cache-save
         uses: 'actions/cache/save@v4'
         with:
-          key: ${{ steps.bazel-cache-restore.outputs.cache-primary-key }}
           path: ${{ STEPS.SETUP.OUTPUTS.CACHE_PATH }}
+          key: ${{ STEPS.BAZEL-CACHE-RESTORE.OUTPUTS.CACHE-PRIMARY-KEY }}

docker/rpm-builder/Dockerfile

@@ -59,7 +59,7 @@ ENV RPM_SIGN_PASSPHRASE=""
 ENTRYPOINT [ "/bin/bash", "-c", "/home/runner/build.sh", "${REPO_USER}", "${REPO_NAME}", "${REPO_BRANCH}" ]
 
 # Build dependencies.
-RUN [ "dnf", "-y", "install", "git", "cmake", "gcc-c++", "rpm-build", "golang-bin", "expect", "vim-common", "ncurses-compat-libs", "curl-devel", "wayland-devel", "libaom-devel", "opus-devel", "libzip-devel", "libzstd-devel", "protobuf-devel", "protobuf-compiler" ]
+RUN [ "dnf", "-y", "install", "git", "cmake", "gcc-c++", "rpm-build", "golang-bin", "expect", "vim-common", "ncurses-compat-libs", "curl-devel", "wayland-devel", "libaom-devel", "opus-devel", "libzip-devel", "protobuf-devel", "protobuf-compiler" ]
 RUN [ "dnf", "-y", "upgrade" ]
 RUN [ "dnf", "clean", "all" ]
 

docker/rpm-builder/scripts/install_rpm.sh

@@ -5,8 +5,6 @@
 cd "${HOME}/.rpms" || echo "${HOME}/.rpms not found, exiting now." && exit 1
 
 PACKAGES="nano"
-for FILE in ${HOME}/.rpms; do
-    PACKAGES="${PACKAGES} $FILE"
-done
+for package in ${HOME}/.rpms; do PACKAGES="${PACKAGES} $package"; done
 echo "Packages to install: ${PACKAGES}"
 dnf -y install "${PACKAGES}"

tools/rpmbuild/SPECS/cuttlefish_base.spec

@@ -11,7 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Note: `ncurses-compat-libs` require EPEL repository and `protobuf` requires CRB repository.
 BuildRequires:  go, cmake, gcc-c++, ncurses-compat-libs, protobuf-devel, protobuf-compiler, vim-common
-BuildRequires:   curl-devel, openssl-devel, wayland-devel, libaom-devel, opus-devel, libzip-devel, libzstd-devel
+BuildRequires:   curl-devel, openssl-devel, wayland-devel, libaom-devel, opus-devel, libzip-devel
 
 Requires:       shadow-utils, redhad-lsb-5.0, ebtables-legacy, iproute
 Requires:       iptables-legacy, bridge-utils, dnsmasq, libfdt, e2fsprogs, ebtables, iptables, bsdtar