From db0ab5f6ce8c0b1df3e1231ada1e43e111c2c922 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 6 Mar 2024 18:46:06 -0300 Subject: [PATCH] Debugging publish action. --- .github/workflows/publish.yml | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------- win/ci-build.sh | 49 ------------------------------------------------- 2 files changed, 61 insertions(+), 63 deletions(-) delete mode 100644 win/ci-build.sh diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3bf9d97..bbaddb2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,8 +1,7 @@ ---- name: Publish on: push: - branches: [ "publish" ] + branches: [ "develop" ] tags: [ "*" ] jobs: @@ -13,20 +12,11 @@ jobs: shell: msys2 {0} steps: - uses: actions/checkout@v3 - - uses: oprypin/find-latest-tag@v1 - id: gettag - with: - repository: PerryWerneck/pw3270 - sort-tags: true - releases-only: true - uses: msys2/setup-msys2@v2 with: msystem: mingw64 update: true - install: xz dos2unix mingw-w64-x86_64-gcc automake autoconf make git pkgconf - mingw-w64-x86_64-gettext gettext-devel mingw-w64-x86_64-openssl - libtool mingw-w64-x86_64-gtk3 mingw-w64-x86_64-librsvg mingw-w64-x86_64-gdk-pixbuf2 - mingw-w64-x86_64-optipng mingw-w64-x86_64-nsis + 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 mingw-w64-x86_64-gtk3 mingw-w64-x86_64-imagemagick mingw-w64-x86_64-optipng mingw-w64-x86_64-inkscape - uses: robinraju/release-downloader@v1.7 with: repository: "PerryWerneck/lib3270" @@ -37,8 +27,17 @@ jobs: repository: "PerryWerneck/libv3270" latest: true fileName: "mingw-w64-x86_64-libv3270-5.4-0-x86_64.pkg.tar.zst" - - name: BuildApp - run: ./win/ci-build.sh + - name: CI-Build + run: | + pacman -U --noconfirm *.pkg.tar.zst + dos2unix PKGBUILD.mingw + makepkg BUILDDIR=/tmp/pkg -p PKGBUILD.mingw + - uses: oprypin/find-latest-tag@v1 + id: gettag + with: + repository: PerryWerneck/pw3270 + sort-tags: true + releases-only: true - uses: ncipollo/release-action@v1 with: tag: ${{ steps.gettag.outputs.tag }} @@ -78,4 +77,52 @@ jobs: omitBody: true omitPrereleaseDuringUpdate: true replacesArtifacts: true + macos-publish: + runs-on: macos-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Install Pre reqs + run: | + brew remove azure-cli + find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete + find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete + rm -rf /usr/local/bin/2to3* + rm -rf /usr/local/bin/idle3* + rm -rf /usr/local/bin/pydoc3* + rm -rf /usr/local/bin/python3 + rm -rf /usr/local/bin/python3-config + rm -rf /usr/local/bin/python3* + rm -rf /usr/local/bin/python3*-config + find /usr/local/lib/node_modules/npm -delete + brew update + brew install xz automake libtool binutils coreutils curl gettext libtool openssl pkgconfig gtk+3 + - uses: robinraju/release-downloader@v1.7 + with: + repository: "PerryWerneck/lib3270" + latest: true + fileName: "macos-lib3270.tar.xz" + - uses: robinraju/release-downloader@v1.7 + with: + repository: "PerryWerneck/libv3270" + latest: true + fileName: "macos-libv3270.tar.xz" + - name: build + run: ./mac/ci-build.sh + - uses: oprypin/find-latest-tag@v1 + id: gettag + with: + repository: PerryWerneck/pw3270 + sort-tags: true + releases-only: true + - uses: ncipollo/release-action@v1 + with: + tag: ${{ steps.gettag.outputs.tag }} + artifacts: "macos-*.tar.xz" + allowUpdates: true + draft: false + makeLatest: true + omitBody: true + omitPrereleaseDuringUpdate: true + replacesArtifacts: true diff --git a/win/ci-build.sh b/win/ci-build.sh deleted file mode 100644 index 40e1309..0000000 --- a/win/ci-build.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# -# SPDX-License-Identifier: LGPL-3.0-or-later -# -# Copyright (C) 2008 Banco do Brasil S.A. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . - -# -# References: -# -# * https://www.msys2.org/docs/ci/ -# - -echo "Running ${0}" - -die ( ) { - [ "$1" ] && echo "$*" - exit -1 -} - -cd $(dirname $(dirname $(readlink -f ${0}))) - -# -# Install pre-reqs -# -echo "Installing pre-reqs..." -pacman -U --noconfirm *.pkg.tar.zst || die "pre-reqs failure" - -# -# Build -# -echo "Building package..." -dos2unix PKGBUILD.mingw || die "dos2unix failure" -makepkg BUILDDIR=/tmp/pkg -p PKGBUILD.mingw || die "makepkg failure" - -echo "Build complete" - -- libgit2 0.21.2