From 689802201210cc57738624b28475c44bf7c869c8 Mon Sep 17 00:00:00 2001
From: Shawn Carey <shawn.carey@netfoundry.io>
Date: Fri, 18 Aug 2023 16:28:15 +0000
Subject: [PATCH] push packages to artifactory again (#710)

* check release event for prerelease

* ensure cmake version discovery works
---
 .github/workflows/cmake.yml | 13 +++++++++++++
 .github/workflows/cpack.yml |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index c312c106..3b511786 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -54,6 +54,19 @@ jobs:
             preset: linux-arm64-static-libssl
 
     steps:
+      # only focal-20.04 has >= 2.18, which is required by actions/checkout to clone
+      # which enables cmake version discovery. remove this step when openziti:ziti-builder
+      # is upgraded to a version that contains git 2.18+
+      - name: install contemporary Git if Ubuntu
+        if: ${{ matrix.distro.name == 'ubuntu' }}
+        run: |
+          apt -y update
+          apt-get -y install software-properties-common
+          add-apt-repository -y ppa:git-core/ppa
+          apt -y update
+          apt -y install git
+          git --version
+
       - name: checkout workspace
         uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/cpack.yml b/.github/workflows/cpack.yml
index e6488a27..93c69ac6 100644
--- a/.github/workflows/cpack.yml
+++ b/.github/workflows/cpack.yml
@@ -180,13 +180,13 @@ jobs:
           if-no-files-found: error
 
       - name: Configure jFrog CLI
-        if: ${{ github.event.release.published && startsWith(github.ref, 'refs/tags/v') }}
+        if: ${{ !github.event.release.prerelease && startsWith(github.ref, 'refs/tags/v') }}
         uses: jfrog/setup-jfrog-cli@v3
         env:
           JF_ENV_1: ${{ secrets.ZITI_ARTIFACTORY_CLI_CONFIG_PACKAGE_UPLOAD }}
 
       - name: Upload RPM to Artifactory with jFrog CLI
-        if: ${{ github.event.release.published && startsWith(github.ref, 'refs/tags/v') && matrix.distro.name == 'redhat' }}
+        if: ${{ !github.event.release.prerelease && startsWith(github.ref, 'refs/tags/v') && matrix.distro.name == 'redhat' }}
         run: >
           jf rt upload
           ./build/ziti-edge-tunnel-*.${{ matrix.distro.type }}
@@ -195,7 +195,7 @@ jobs:
           --flat=true 
 
       - name: Upload DEB to Artifactory with jFrog CLI
-        if: ${{ github.event.release.published && startsWith(github.ref, 'refs/tags/v') && matrix.distro.name == 'ubuntu' }}
+        if: ${{ !github.event.release.prerelease && startsWith(github.ref, 'refs/tags/v') && matrix.distro.name == 'ubuntu' }}
         run: >
           jf rt upload
           ./build/ziti-edge-tunnel-*.${{ matrix.distro.type }}