diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 44819f87..c330b1b1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: push: branches: - - rpm-pkg + - main jobs: release: @@ -16,7 +16,7 @@ jobs: - cos-csi-mounter env: - IS_LATEST_RELEASE: 'true' + IS_LATEST_RELEASE: 'false' APP_VERSION: 1.0.1 steps: @@ -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 @@ -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' }} diff --git a/cos-csi-mounter/Makefile b/cos-csi-mounter/Makefile index 52d17326..ccfa779f 100644 --- a/cos-csi-mounter/Makefile +++ b/cos-csi-mounter/Makefile @@ -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) @@ -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) @@ -106,6 +106,7 @@ 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} @@ -113,4 +114,4 @@ clean: rm -rf packages packages: -packages: deb-build rpm-build tar-package clean \ No newline at end of file +packages: deb-build rpm-build tar-package clean