Release v0.9.2 (#423)

* meson: Remove deprecated --sort-output

* purging: Fix format specifier

* Update pot and po files

* Use v1 of andy5995/gh-action-build-deb

* meson: comment out sanitize

* Get version from meson.build

* meson.wrap: Get canfigger v0.3.0 instead of latest

.github/workflows/release.yml

@@ -1,28 +1,28 @@
 name: Release
 concurrency:
-  group: ${{ github.workflow }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 
 on:
   pull_request:
     branches: master
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'version number'
-        required: true
-        type: string
-
-env:
-  VERSION: ${{ inputs.version }}
+    paths:
+    - '**release.yml'
 
 jobs:
   dist:
     runs-on: ubuntu-22.04
+    outputs:
+      rmw_version: ${{ steps.get_version.outputs.version }}
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: false
+    - id: get_version
+      run: |
+        VERSION=$(grep "version:" meson.build | awk -F"'" '{print $2}')
+        echo "version=$VERSION" >> $GITHUB_OUTPUT
+        echo "VERSION=$VERSION" >> $GITHUB_ENV
     - name: Install dependencies
       run: |
         sudo apt install -y \
@@ -35,11 +35,11 @@ jobs:
         cd builddir
         meson dist --include-subprojects
         cd meson-dist
-        REL_TAR="rmw-${VERSION}.tar"
-        xz -d ${REL_TAR}.xz
-        tar --delete -f ${REL_TAR} rmw-${VERSION}/packaging
-        xz ${REL_TAR}
-        sha256sum ${REL_TAR}.xz > ${REL_TAR}.xz.sha256sum
+        REL_TAR="rmw-$VERSION.tar"
+        xz -d "$REL_TAR.xz"
+        tar --delete -f "$REL_TAR" "rmw-$VERSION/packaging"
+        xz "$REL_TAR"
+        sha256sum "$REL_TAR.xz" > "$REL_TAR.xz.sha256sum"
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4
       with:
@@ -48,15 +48,13 @@ jobs:
 
   build-appimage:
     runs-on: ubuntu-latest
+    needs: dist
     strategy:
       matrix:
         platform:
           - linux/amd64
           - linux/arm64
-          - linux/arm/v7
 
-    env:
-      VERSION: ${{ inputs.version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -68,9 +66,8 @@ jobs:
 
       - name: Set variables
         run: |
-          if [ -z "$VERSION" ]; then
-            echo "VERSION=${{ github.sha }}" >> $GITHUB_ENV
-          fi
+          VERSION=${{ needs.dist.outputs.rmw_version }}
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: Build AppImage
         run: |
@@ -98,24 +95,36 @@ jobs:
           if-no-files-found: error
 
   build-deb:
-    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        platform:
+          - amd64
+          - arm64
+          - 386
+
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
+
     - name: Copy debian directory
       run: cp -a packaging/debian .
-    - uses: legoktm/gh-action-build-deb@debian-bullseye
-      id: build-debian-bullseye
+
+    - uses: andy5995/gh-action-build-deb@v1
       with:
         args: --no-sign
-        sources: deb http://deb.debian.org/debian bullseye-backports main
+        platform: ${{ matrix.platform }}
+
     - name: Create sha256sum
       run: |
+        DEB_FILENAME=$(basename `find output/*deb`)
+        echo "DEB_FILENAME=$DEB_FILENAME" >> $GITHUB_ENV
         cd output
-        sha256sum rmw_${VERSION}_amd64.deb > ../rmw_${VERSION}_amd64.deb.sha256sum
+        sha256sum "$DEB_FILENAME" > "../$DEB_FILENAME.sha256sum"
+
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: rmw_debian_pkg
+        name: ${{ env.DEB_FILENAME }}
         path: |
           output/*.deb
           *deb.sha256sum

ChangeLog

@@ -1,5 +1,9 @@
 === rmw ChangeLog ===
 
+2024-03-18
+
+  * Release v0.9.2
+
 2024-03-08
 
   * Fix translations not working when using the AppImage

README.md

@@ -1,4 +1,4 @@
-# rmw-0.9.1.555
+# rmw-0.9.2
 ## Description
 
 rmw (ReMove to Waste) is a trashcan/recycle bin utility for the command line.

ReleaseNotes

@@ -1,12 +1,7 @@
 === RMW Release Notes ===
 
-v0.9.1
+v0.9.2
 
-  * bugfix: In some cases, trashinfo file doesn't get removed (#400)
-  * tests: build or rebuild binary before running script-based tests (fix for
-  script-based test failures when 'meson test' is run in a clean build
-  directory)
-  - on MacOS and *bsd, specifying the PKG_CONFIG_PATH is no longer needed to
-  find the ncurses menu library
-  * fix build on Alpine Linux (check for and link to musl-fts) Thanks to
-  @eli-schwartz and Hello71 from #musl on Libera IRC.
+* Show counter in real-time as items are getting purged
+* Update for use with canfigger 0.3.0
+* Fix translations not working when using the AppImage

man/rmw.1

@@ -1,4 +1,4 @@
-.TH RMW "1" "May 2023" "rmw 0.9.1" "User Commands"
+.TH RMW "1" "Mar 2024" "rmw 0.9.2" "User Commands"
 .SH NAME
 rmw \- safe-remove utility for the command line
 .SH SYNOPSIS
@@ -214,7 +214,7 @@ The RMW team: see AUTHORS.md
 .SH REPORTING BUGS
 Report bugs to <https://github.com/theimpossibleastronaut/rmw/issues>.
 .SH "COPYRIGHT"
-Copyright \(co 2012-2023 Andy Alt
+Copyright \(co 2012-2024 Andy Alt
 
 License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>.
 .br

meson.build

@@ -1,13 +1,13 @@
 project(
   'rmw',
   'c',
-  version: '0.9.1.555',
+  version: '0.9.2',
   meson_version : '>= 0.59.0',
   default_options: [
     'warning_level=3',
     'pkg_config_path=/usr/local/opt/ncurses/lib/pkgconfig,/opt/homebrew/opt/ncurses/lib/pkgconfig',
-    'b_sanitize=address,undefined',
-    'b_lundef=false',
+#    'b_sanitize=address,undefined',
+#    'b_lundef=false',
     ]
   )
 

packaging/appimage/pre-appimage.sh

@@ -60,6 +60,7 @@ fi
 # Build project
 cd "$BUILD_DIR"
 ninja
+meson test -v
 meson install --destdir=$APPDIR --skip-subprojects
 
 # Set up output directory

packaging/debian/changelog

@@ -1,5 +1,6 @@
-rmw (0.9.1) stable; urgency=medium
+rmw (0.9.2) stable; urgency=medium
 
+  [ Andy Alt ]
   * New upstream release
 
- -- Andy Alt <[email protected]>  Wed, 17 May 2023 05:50:56 +0000
+ -- Andy Alt <[email protected]>  Mon, 18 Mar 2024 04:39:09 +0000

packaging/debian/control

@@ -5,7 +5,7 @@ Maintainer: Andy Alt <[email protected]>
 Build-Depends:  debhelper (>= 12~),
                 libncursesw5-dev,
                 libtinfo-dev,
-                meson (>= 0.56.2)
+                meson (>= 0.59.0)
 Standards-Version: 4.6.2
 Homepage: https://theimpossibleastronaut.github.io/rmw-website/
 

packaging/debian/rules

@@ -6,5 +6,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 	dh $@
 
 override_dh_auto_configure:
-	apt install -y meson -t bullseye-backports
-	dh_auto_configure -- --buildtype=release --prefix=/usr -Dstrip=true -Db_sanitize=none -Db_pie=true
+	dh_auto_configure -- \
+		--buildtype=release \
+		--wrap-mode forcefallback \
+		--prefix=/usr \
+		-Dstrip=true\
+		-Db_sanitize=none \
+		-Db_pie=true

packaging/release-checklist.txt

@@ -8,6 +8,15 @@ Change version number
   packaging/file_id.diz (filegate.net)
   cd packaging and run 'dch -r' (updates the changelog timestamp in debian/
 
+In meson,build, comment out
+  'b_sanitize=address,undefined',
+  'b_lundef=false'
+
+## canfigger.wrap
+
+Make sure the revision points to the last release, or to a revision where
+sanitize is disabled
+
 For later Debian package creation, check standards version
   https://www.debian.org/doc/debian-policy/upgrading-checklist.html
 
@@ -73,3 +82,5 @@ Close milestone (https://github.com/theimpossibleastronaut/rmw/milestones)
 Create Slackbuild tarball and submit to Slackbuilds.org (https://slackbuilds.org/guidelines/)
 
 Update latest release info on /docker/README.md
+
+Tag latest release with version number and push to docker hub