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

use contemporary git from new builder image #716

Merged
merged 1 commit into from
Sep 20, 2023
Merged
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
19 changes: 3 additions & 16 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,34 +39,21 @@ jobs:
preset: windows-arm64

- os: ubuntu-20.04
container: openziti/ziti-builder:1.0.3
container: openziti/ziti-builder:1.0.7
name: Linux x86_64
preset: linux-x64

- os: ubuntu-20.04
container: openziti/ziti-builder:1.0.3
container: openziti/ziti-builder:1.0.7
name: Linux arm
preset: linux-arm

- os: ubuntu-20.04
container: openziti/ziti-builder:1.0.3
container: openziti/ziti-builder:1.0.7
name: Linux arm64
preset: linux-arm64

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 using ziti-builder
if: ${{ startsWith(matrix.container, 'openziti/ziti-builder') }}
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
Loading