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.

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

rename ziti-cli package as "openziti" #1413

Merged
merged 2 commits into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 9 additions & 7 deletions .github/workflows/publish-linux-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
package_name:
- ziti-cli
- openziti
arch:
- goreleaser: amd64
gox: amd64
Expand All @@ -39,8 +39,10 @@ jobs:
ZITI_HOMEPAGE: "https://openziti.io"
ZITI_VENDOR: "NetFoundry"
GOARCH: ${{ matrix.arch.goreleaser }}
ZITI_DEB_REPO: ${{ vars.ZITI_DEB_REPO || 'zitipax-openziti-deb-stable' }}
ZITI_RPM_REPO: ${{ vars.ZITI_RPM_REPO || 'zitipax-openziti-rpm-stable' }}
ZITI_DEB_TEST_REPO: ${{ vars.ZITI_DEB_TEST_REPO || 'zitipax-openziti-deb-test' }}
ZITI_DEB_PROD_REPO: ${{ vars.ZITI_DEB_PROD_REPO || 'zitipax-openziti-deb-stable' }}
ZITI_RPM_TEST_REPO: ${{ vars.ZITI_RPM_TEST_REPO || 'zitipax-openziti-rpm-test' }}
ZITI_RPM_PROD_REPO: ${{ vars.ZITI_RPM_PROD_REPO || 'zitipax-openziti-rpm-stable' }}
steps:
- name: Checkout Workspace
uses: actions/checkout@v3
Expand Down Expand Up @@ -92,7 +94,7 @@ jobs:
run: >
jf rt upload
./release/${{ matrix.package_name }}*.${{ matrix.nfpm_packager }}
/${{ env.ZITI_RPM_REPO }}/testing/${{ matrix.arch.rpm }}/
/${{ env.ZITI_RPM_TEST_REPO }}/testing/${{ matrix.arch.rpm }}/
--recursive=false
--flat=true

Expand All @@ -103,7 +105,7 @@ jobs:
run: >
jf rt upload
./release/${{ matrix.package_name }}*.${{ matrix.nfpm_packager }}
/${{ env.ZITI_RPM_REPO }}/release/${{ matrix.arch.rpm }}/
/${{ env.ZITI_RPM_PROD_REPO }}/release/${{ matrix.arch.rpm }}/
--recursive=false
--flat=true

Expand All @@ -113,7 +115,7 @@ jobs:
run: >
jf rt upload
./release/${{ matrix.package_name }}*.${{ matrix.nfpm_packager }}
/${{ env.ZITI_DEB_REPO }}/pool/${{ matrix.package_name }}/testing/${{ matrix.arch.deb }}/
/${{ env.ZITI_DEB_TEST_REPO }}/pool/${{ matrix.package_name }}/testing/${{ matrix.arch.deb }}/
--deb=testing/main/${{ matrix.arch.deb }}
--recursive=false
--flat=true
Expand All @@ -125,7 +127,7 @@ jobs:
run: >
jf rt upload
./release/${{ matrix.package_name }}*.${{ matrix.nfpm_packager }}
/${{ env.ZITI_DEB_REPO }}/pool/${{ matrix.package_name }}/release/${{ matrix.arch.deb }}/
/${{ env.ZITI_DEB_PROD_REPO }}/pool/${{ matrix.package_name }}/release/${{ matrix.arch.deb }}/
--deb=release/main/${{ matrix.arch.deb }}
--recursive=false
--flat=true
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
#
# check https://nfpm.goreleaser.com/configuration for detailed usage
#
name: ziti-cli
name: openziti
arch: ${GOARCH}
platform: linux
version: ${ZITI_VERSION}
maintainer: ${ZITI_MAINTAINER}
description: >
The ziti-cli package provides the ziti executable binary as a command line
The openziti package provides the ziti executable binary as a command line
interface for Ziti.
vendor: ${ZITI_VENDOR}
homepage: ${ZITI_HOMEPAGE}
Expand All @@ -21,6 +21,8 @@ contents:
- src: /opt/openziti/bin/ziti
dst: /usr/bin/ziti
type: symlink
replaces:
- ziti-cli

# packager-neutral scripts may be overriden by packager-specific scripts
# scripts:
Expand Down