From 9679a3218c9e511c0e3f9e3e59e3c7c956313000 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Sat, 25 Mar 2023 17:14:33 -0300
Subject: [PATCH] Publishing win32 & macos artifacts in the same action.

---
 .github/workflows/macos.yml   | 35 -----------------------------------
 .github/workflows/msys2.yml   | 39 ---------------------------------------
 .github/workflows/publish.yml | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 74 deletions(-)
 delete mode 100644 .github/workflows/macos.yml
 delete mode 100644 .github/workflows/msys2.yml
 create mode 100644 .github/workflows/publish.yml

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
deleted file mode 100644
index 6732975..0000000
--- a/.github/workflows/macos.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: MacOS
-on:
-  push:
-    branches:
-      [ develop ]
-jobs:
-  macos-build:
-    name: Build for mac
-    runs-on: macos-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - uses: oprypin/find-latest-tag@v1
-        id: gettag
-        with:
-          repository: PerryWerneck/lib3270
-          releases-only: true
-      - name: Install Pre reqs
-        run: |
-          brew update
-          brew install xz automake binutils coreutils curl gettext libtool openssl pkgconfig
-          brew upgrade
-      - name: build
-        run: ./mac/ci-build.sh
-      - uses: ncipollo/release-action@v1
-        with:
-          tag: ${{ steps.gettag.outputs.tag }}
-          artifacts: "*.tar.xz"
-          allowUpdates: true
-          draft: false
-          makeLatest: true
-          omitBody: true
-          omitPrereleaseDuringUpdate: true
-          replacesArtifacts: true
-
diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
deleted file mode 100644
index c0cb98d..0000000
--- a/.github/workflows/msys2.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: MSYS2
-on:
-  push:
-    branches:
-      - master
-  schedule:
-    - cron:  '30 13 1 2,4,6,8,10,12 *'
-jobs:
-  msys2-mingw:
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: oprypin/find-latest-tag@v1
-        id: gettag
-        with:
-          repository: PerryWerneck/lib3270
-          releases-only: true
-      - uses: msys2/setup-msys2@v2
-        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
-      - name: CI-Build
-        run: ./win/ci-build.sh
-      - uses: ncipollo/release-action@v1
-        with:
-          tag: ${{ steps.gettag.outputs.tag }}
-          artifacts: "*.tar.xz"
-          allowUpdates: true
-          draft: false
-          makeLatest: true
-          omitBody: true
-          omitPrereleaseDuringUpdate: true
-          replacesArtifacts: true
-          
-
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 0000000..44c83c9
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,68 @@
+name: Publish
+on:
+  push:
+    branches:
+      - master
+      - develop
+  schedule:
+    - cron:  '30 13 1 2,4,6,8,10,12 *'
+jobs:
+  msys2-mingw:
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: oprypin/find-latest-tag@v1
+        id: gettag
+        with:
+          repository: PerryWerneck/lib3270
+          releases-only: true
+      - uses: msys2/setup-msys2@v2
+        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
+      - name: CI-Build
+        run: ./win/ci-build.sh
+      - uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ steps.gettag.outputs.tag }}
+          artifacts: "*.tar.xz"
+          allowUpdates: true
+          draft: false
+          makeLatest: true
+          omitBody: true
+          omitPrereleaseDuringUpdate: true
+          replacesArtifacts: true
+  macos:
+    name: Build for mac
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - uses: oprypin/find-latest-tag@v1
+        id: gettag
+        with:
+          repository: PerryWerneck/lib3270
+          releases-only: true
+      - name: Install Pre reqs
+        run: |
+          brew update
+          brew install xz automake binutils coreutils curl gettext libtool openssl pkgconfig
+          brew upgrade
+      - name: build
+        run: ./mac/ci-build.sh
+      - uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ steps.gettag.outputs.tag }}
+          artifacts: "*.tar.xz"
+          allowUpdates: true
+          draft: false
+          makeLatest: true
+          omitBody: true
+          omitPrereleaseDuringUpdate: true
+          replacesArtifacts: true
+          
+
--
libgit2 0.21.2