Skip to content

Remove mount.share dependency to fix rpm package creation issue #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 17, 2025
Merged

Remove mount.share dependency to fix rpm package creation issue #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6a52410
Remove dependency from rpm package
mssachan Jul 15, 2025
cee56f3
Update package version
mssachan Jul 15, 2025
9643787
publish v0.6.1
mssachan Jul 15, 2025
4c7b951
publish v0.6.1
mssachan Jul 15, 2025
ab4ee30
publish v0.6.2
mssachan Jul 15, 2025
b03ce90
publish v0.6.2 and print files of rpm packages
mssachan Jul 16, 2025
069dd6d
publish v0.6.2 and print files of rpm packages
mssachan Jul 16, 2025
2df6a04
publish v0.6.3 and dsiable uild-id symlinks
mssachan Jul 16, 2025
47d6c51
revert package version
mssachan Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release
on:
push:
branches:
- rpm-pkg
- main

jobs:
release:
Expand All @@ -16,7 +16,7 @@ jobs:
- cos-csi-mounter

env:
IS_LATEST_RELEASE: 'true'
IS_LATEST_RELEASE: 'false'
APP_VERSION: 1.0.1

steps:
Expand All @@ -34,7 +34,7 @@ jobs:
- name: Run Unit Tests for cos csi mounter
run: sudo make ut-coverage -C ${{ matrix.package_dir }}

- name: Build Debian and RPM Packagesfor cos csi mounter container
- name: Build Debian and RPM packages for cos-csi-mounter systemd service
run: |
cd ${{ matrix.package_dir }}
make packages
Expand Down Expand Up @@ -63,8 +63,8 @@ jobs:
/home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.deb.tar.gz.sha256
/home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz
/home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz.sha256
tag_name: v0.5.4
name: v0.5.4
tag_name: v1.0.1
name: v1.0.1
body: Generate debian and rpm packages
prerelease: ${{ env.IS_LATEST_RELEASE != 'true' }}

Expand Down
11 changes: 6 additions & 5 deletions cos-csi-mounter/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ rpm-build: build-linux
echo "Name: $(NAME)" > $(REDHAT_SPEC)
echo "Version: $(APP_VERSION)" >> $(REDHAT_SPEC)
echo "Release: $(RPM_RELEASE_NUM)" >> $(REDHAT_SPEC)
echo "Summary: $(DESCRIPTION)" >> $(REDHAT_SPEC)
echo "License: $(LICENSE)" >> $(REDHAT_SPEC)
echo 'Summary: $(DESCRIPTION)' >> $(REDHAT_SPEC)
echo 'License: $(LICENSE)' >> $(REDHAT_SPEC)
echo "BuildArch: $(RPM_ARCH)" >> $(REDHAT_SPEC)
echo "Requires: mount.ibmshare = 0.1.1" >> $(REDHAT_SPEC)
echo "%global _build_id_links none" >> $(REDHAT_SPEC)
echo "%define _rpmfilename $(NAME)-$(APP_VERSION).rpm" >> $(REDHAT_SPEC)
echo "%build" >> $(REDHAT_SPEC)

Expand All @@ -77,7 +77,7 @@ rpm-build: build-linux
echo "cp -r %{_sourcedir}/* %{buildroot}/" >> $(REDHAT_SPEC)

echo "%description" >> $(REDHAT_SPEC)
echo "This package provides the IBM Mount Share helper container service."
echo "This package provides the COS CSI Mounter service." >> $(REDHAT_SPEC)

echo "%files" >> $(REDHAT_SPEC)
echo "/etc/systemd/system/cos-csi-mounter.service" >> $(REDHAT_SPEC)
Expand Down Expand Up @@ -106,11 +106,12 @@ tar-package:
sha256sum $(INSTALL_TAR_FILE_DEB) > $(CHECKSUM_FILE_DEB)
sha256sum $(INSTALL_TAR_FILE_RPM) > $(CHECKSUM_FILE_RPM)
@printf "Production - Install package created ok: $(INSTALL_TAR_FILE_DEB) and $(INSTALL_TAR_FILE_RPM)\n"
rpm -qlp cos-csi-mounter-$(APP_VERSION).rpm

clean:
rm -rf ${BIN_DIR}
rm *.deb *.rpm
rm -rf packages

packages:
packages: deb-build rpm-build tar-package clean
packages: deb-build rpm-build tar-package clean