Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

push packages to artifactory again #710

Merged
merged 2 commits into from
Aug 18, 2023
Merged

push packages to artifactory again #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02fe9aa
check release event for prerelease
scareything Aug 18, 2023
6e0c913
ensure cmake version discovery works
scareything Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be great if anyone can double check me on this event structure. I looked at the docs and a recent event (select gear icon -> view raw logs)

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 }}
Expand All @@ -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 }}
Expand Down
Loading