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

update [email protected] #1003

Merged
merged 3 commits into from
Oct 7, 2024
Merged

update [email protected] #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67f2dfb
update [email protected]
ekoby Oct 7, 2024
722073b
always clone latest vcpkg when building packet builder images.
scareything Oct 7, 2024
1c90524
update [email protected]
ekoby Oct 7, 2024
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
10 changes: 7 additions & 3 deletions .github/actions/build/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,13 @@ runs:

- uses: lukka/run-vcpkg@v11
with:
# use 2024.08.23 vcpkg baseline,
# see https://learn.microsoft.com/en-us/vcpkg/users/examples/versioning.getting-started#builtin-baseline
vcpkgGitCommitId: '3508985146f1b1d248c67ead13f8f54be5b4f5da'
# get baseline from vcpkg
vcpkgJsonGlob: './vcpkg.json'

- uses: actions/cache@v4
with:
key: deps-${{ inputs.preset }}-${{ hashFiles('./vcpkg.json') }}
path: './vcpkg/packages'

- uses: lukka/[email protected] # pin version to avoid failed glibc dependency on ubuntu 20 runners. go back to @latest when ubuntu 22+ is adopted for runner os.
name: Configure CMake
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ENV VCPKG_ROOT=/usr/local/vcpkg
ENV VCPKG_FORCE_SYSTEM_BINARIES=yes

RUN cd /usr/local \
&& git clone --branch 2024.08.23 https://github.com/microsoft/vcpkg \
&& git clone https://github.com/microsoft/vcpkg \
&& ./vcpkg/bootstrap-vcpkg.sh -disableMetrics

WORKDIR /github/workspace
Expand Down
4 changes: 1 addition & 3 deletions .github/actions/openziti-tunnel-build-action/redhat-9/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
ARG CMAKE_VERSION="3.26.3"
ARG VCPKG_VERSION="2024.08.23"

FROM rockylinux:9

ARG CMAKE_VERSION
ARG VCPKG_VERSION

LABEL org.opencontainers.image.authors="[email protected]"

Expand Down Expand Up @@ -46,7 +44,7 @@ ENV VCPKG_ROOT=/usr/local/vcpkg
ENV VCPKG_FORCE_SYSTEM_BINARIES=yes

RUN cd /usr/local \
&& git clone --branch "${VCPKG_VERSION}" https://github.com/microsoft/vcpkg \
&& git clone https://github.com/microsoft/vcpkg \
&& ./vcpkg/bootstrap-vcpkg.sh -disableMetrics \
&& chmod -R ugo+rwX /usr/local/vcpkg

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/openziti-tunnel-build-action/ubuntu-20.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ ENV VCPKG_FORCE_SYSTEM_BINARIES=yes

RUN cd /usr/local \
&& git config --global advice.detachedHead false \
&& git clone --branch 2024.08.23 https://github.com/microsoft/vcpkg \
&& git clone https://github.com/microsoft/vcpkg \
&& ./vcpkg/bootstrap-vcpkg.sh -disableMetrics

COPY ./entrypoint.sh /root/
Expand Down
4 changes: 1 addition & 3 deletions .github/actions/openziti-tunnel-build-action/ubuntu-22.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
ARG CMAKE_VERSION="3.26.3"
ARG VCPKG_VERSION="2024.08.23"

# Ubuntu Jammy 22.04 LTS
FROM ubuntu:jammy

ARG CMAKE_VERSION
ARG VCPKG_VERSION

LABEL org.opencontainers.image.authors="[email protected]"

Expand Down Expand Up @@ -59,7 +57,7 @@ ENV VCPKG_FORCE_SYSTEM_BINARIES=yes

RUN cd /usr/local \
&& git config --global advice.detachedHead false \
&& git clone --branch "${VCPKG_VERSION}" https://github.com/microsoft/vcpkg \
&& git clone https://github.com/microsoft/vcpkg \
&& ./vcpkg/bootstrap-vcpkg.sh -disableMetrics

COPY ./entrypoint.sh /root/
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.21)


set(ZITI_SDK_DIR "" CACHE FILEPATH "developer option: use local ziti-sdk-c checkout")
set(ZITI_SDK_VERSION "2.0.0-alpha28" CACHE STRING "ziti-sdk-c version or branch to use")
set(ZITI_SDK_VERSION "2.0.0-alpha29" CACHE STRING "ziti-sdk-c version or branch to use")

# if TUNNEL_SDK_ONLY then don't descend into programs/ziti-edge-tunnel
option(TUNNEL_SDK_ONLY "build only ziti-tunnel-sdk (without ziti)" OFF)
Expand Down
Loading