Merge pull request #65 from PerryWerneck/macos

Debugging actions, fixing macos action.

.github/workflows/macpkg.yml → .github/workflows/macos.yml

@@ -1,33 +1,31 @@
-name: Publish
+name: check-macos
 on:
   push:
-    branches:
-      - macos  
+    branches: [ "macos" ]
   pull_request:
-    branches:
-      - master
-      - develop      
+    branches: [ "master" ]
+
 jobs:
-  macos:
-    name: Publish macos
+  macos-build:
     runs-on: macos-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - uses: oprypin/find-latest-tag@v1
-        id: gettag
-        with:
-          repository: PerryWerneck/pw3270
-          sort-tags: true
-          releases-only: true
       - name: Install Pre reqs
         run: |
-          brew update
-          brew install xz automake libtool binutils coreutils curl gettext libtool openssl pkgconfig gtk+3
+          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 upgrade
+          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"
@@ -40,14 +38,4 @@ jobs:
           fileName: "macos-libv3270.tar.xz"      
       - name: build
         run: ./mac/ci-build.sh
-      - uses: ncipollo/release-action@v1
-        with:
-          tag: ${{ steps.gettag.outputs.tag }}
-          artifacts: "macos-pw3270.tar.xz"
-          allowUpdates: true
-          draft: true
-          makeLatest: true
-          omitBody: true
-          omitPrereleaseDuringUpdate: true
-          replacesArtifacts: true
 

.github/workflows/msys2.yml

@@ -1,25 +1,18 @@
-name: MSYS2
+name: check-msys2
 on:
-  pull_request:
-    branches:
-      - master
   push:
-    branches:
-      - develop    
+    branches: [ "win" ]
+  pull_request:
+    branches: [ "master" ]
+
 jobs:
-  msys2-mingw:
-    name: Publish Windows 64
+  msys2-build:
     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/pw3270
-          releases-only: true
       - uses: msys2/setup-msys2@v2
         with:
           msystem: mingw64

.github/workflows/winpkg.yml → .github/workflows/publish.yml

@@ -1,15 +1,12 @@
 ---
-name: WinPKG
+name: Publish
 on:
-  pull_request:
-    branches:
-      - master
   push:
-    branches:
-      - winpkg
+    branches: [ "publish" ]
+    tags: [ "*" ]
+
 jobs:
-  msys2-mingw64:
-    name: Publish for Windows 64
+  msys2-publish:
     runs-on: windows-latest
     defaults:
       run:
@@ -74,7 +71,7 @@ jobs:
       - uses: ncipollo/release-action@v1
         with:
           tag: ${{ steps.gettag.outputs.tag }}
-          artifacts: "*-pw3270-*.tar.xz"
+          artifacts: "*-pw3270-*.tar.*"
           allowUpdates: true
           draft: true
           makeLatest: true