From fb56c002109276369ca6c02c2f735ee83bedbbd2 Mon Sep 17 00:00:00 2001 From: Guilherme Janczak Date: Fri, 8 Apr 2022 03:18:33 +0000 Subject: [PATCH] prepare for 1.2.0 --- .github/workflows/release.yml | 9 +++++---- docs/{CHANGELOG.md => CHANGELOG-1.2.0.md} | 2 +- meson.build | 2 +- subprojects/libobsd.wrap | 10 ++++++---- 4 files changed, 13 insertions(+), 10 deletions(-) rename docs/{CHANGELOG.md => CHANGELOG-1.2.0.md} (96%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2eb7430..3a6eaa7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,7 @@ jobs: with: msystem: ${{matrix.sys}} path-type: strict - install: git groff + install: git groff dos2unix pacboy: gcc:p meson:p nsis:p ninja:p jq:p - uses: actions/checkout@v2.4.0 - name: prepare @@ -57,13 +57,14 @@ jobs: name: dist path: build/setup*dictpw* vs-build: + needs: mingw-build runs-on: windows-latest steps: - uses: actions/setup-python@v2.3.1 - name: setup run: | pip install meson - choco install groff + choco install groff dos2unix - uses: actions/checkout@v2.4.0 - name: prepare run: | @@ -85,7 +86,7 @@ jobs: - name: installer run: | $ver = "${{needs.mingw-build.outputs.version}}" - $out = "build\setup-dictpw-${ver}-vs-clang-aarch64.exe" + $out = "build\setup-dictpw-" + "$ver" + "-vs-clang-aarch64.exe" $cmd = "makensis -DOUTFILE='" + "$out" + "' dictpw.nsi" $env:CHERE_INVOKING = 'yes' # Preserve the current working directory $env:MSYSTEM = 'MINGW64' # Start a 64 bit Mingw environment @@ -112,7 +113,7 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - (cd dist && for file in *.exe; do sha256sum *.exe > \ + (cd dist && for file in *.exe; do sha256sum "$file" > \ "${file}.sha256sum"; done) ver="${{needs.mingw-build.outputs.version}}" gh release create "v$ver" --title "dictpw $ver" \ diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG-1.2.0.md similarity index 96% rename from docs/CHANGELOG.md rename to docs/CHANGELOG-1.2.0.md index aa4daa7..17fe95b 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG-1.2.0.md @@ -1,4 +1,4 @@ -Changes in dictpw master: +Changes in dictpw 1.2.0: - Make changelogs readable when concatenated - Overhaul capability limitations to be more portable and strict diff --git a/meson.build b/meson.build index a86f125..ef013b6 100644 --- a/meson.build +++ b/meson.build @@ -12,7 +12,7 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -project('dictpw', 'c', version: '1.1.1', +project('dictpw', 'c', version: '1.2.0', license: 'ISC', default_options: ['c_std=c99', 'b_lto=true', 'warning_level=3']) # Makes all functions, including BSD functions, visible on GNU. diff --git a/subprojects/libobsd.wrap b/subprojects/libobsd.wrap index 1eb90ee..cd64cf1 100644 --- a/subprojects/libobsd.wrap +++ b/subprojects/libobsd.wrap @@ -1,8 +1,10 @@ -[wrap-git] -url = https://github.com/guijan/libobsd.git -revision = respect-license -depth = 1 +[wrap-file] +directory = libobsd-1.1.0 +source_url = https://github.com/guijan/libobsd/releases/download/v1.1.0/libobsd-1.1.0.tar.xz +source_filename = libobsd-1.1.0.tar.xz +source_hash = 64343ccdd3b7c479954d9806a4531091195d410cc54d0172018d959a61693c2c [provide] libbsd-overlay = libobsd_dep libobsd = libobsd_dep +