From 90d16cba8f75242124efd91d8fec262259ec3a0a Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 5 Apr 2023 07:56:35 -0300 Subject: [PATCH] Publishing mingw package instead of tar.xz --- .github/workflows/publish.yml | 7 +++++-- PKGBUILD.mingw | 13 ++++--------- locale/pt_BR.po | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a099d41..8db5692 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,6 +3,9 @@ on: pull_request: branches: - master + push: + branches: + - develop jobs: msys2-mingw: name: Publish for Windows 64 @@ -21,13 +24,13 @@ jobs: with: msystem: mingw64 update: true - install: xz mingw-w64-x86_64-gcc automake autoconf make git pkgconf mingw-w64-x86_64-gettext gettext-devel mingw-w64-x86_64-openssl libtool + install: dos2unix mingw-w64-x86_64-gcc automake autoconf make git pkgconf mingw-w64-x86_64-gettext gettext-devel mingw-w64-x86_64-openssl libtool - name: CI-Build run: ./win/ci-build.sh - uses: ncipollo/release-action@v1 with: tag: ${{ steps.gettag.outputs.tag }} - artifacts: "*-lib3270.tar.xz" + artifacts: "*-lib3270-*.pkg.tar.zst" allowUpdates: true draft: false makeLatest: true diff --git a/PKGBUILD.mingw b/PKGBUILD.mingw index 265df1b..998cfa3 100644 --- a/PKGBUILD.mingw +++ b/PKGBUILD.mingw @@ -18,18 +18,13 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see . -_realname=lib3270 +_realname=$(grep AC_INIT "${startdir}/configure.ac" | cut -d[ -f2 | cut -d] -f1) pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} -source=(git+https://github.com/PerryWerneck/lib3270#branch=develop) +source=() -#pkgver() { -# cd ${srcdir}/${_realname} -# git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g' -#} - -pkgver=5.4 -pkgrel=1 +pkgver=$(grep AC_INIT "${startdir}/configure.ac" | cut -d[ -f3 | cut -d] -f1) +pkgrel=0 pkgdesc="TN3270 Access library" url="https://github.com/PerryWerneck/${_realname}" arch=(i686 x86_64) diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 98c9c8d..84e0dc9 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -2071,7 +2071,7 @@ msgstr "Aguardando resposta do pedido de upload" msgid "Warning" msgstr "Alerta" -#: src/core/windows/util.c:123 src/core/windows/util.c:166 +#: src/core/windows/util.c:124 src/core/windows/util.c:167 #, c-format msgid "Windows error %d" msgstr "Erro windows foi %d" -- libgit2 0.21.2