Skip to content

Commit

Permalink
Tryfix
Browse files Browse the repository at this point in the history
  • Loading branch information
sabedevops committed Oct 6, 2024
2 parents 1ede6f8 + 2d9461e commit df3309c
Show file tree
Hide file tree
Showing 119 changed files with 4,499 additions and 3,315 deletions.
17 changes: 11 additions & 6 deletions .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ inputs:
description: vcpkg build preset, e.g, windows-arm64

config:
default: Release
default: RelWithDebInfo
description: build type

target:
Expand All @@ -20,20 +20,25 @@ inputs:
runs:
using: "composite"
steps:
- name: macOS tools
if: runner.os == 'macOS'
shell: bash
run: brew install autoconf autoconf-archive automake pkg-config

- name: simple build
run: echo "preset = ${{ inputs.preset }}"
shell: bash

- name: install contemporary cmake
uses: lukka/get-cmake@latest
uses: lukka/get-cmake@v3.27.7 # pin version to avoid failed glibc dependency on ubuntu 20 runners. go back to @latest when ubuntu 22+ is adopted for runner os.

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

- uses: lukka/run-cmake@v10
- uses: lukka/run-cmake@v10.6 # 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
with:
configurePreset: ci-${{ inputs.preset }}
Expand Down
7 changes: 0 additions & 7 deletions .github/actions/openziti-tunnel-build-action/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@
- name: ubuntu
version: "20.04"
type: deb
- name: ubuntu
version: "18.04"
type: deb
- name: redhat
version: "7"
type: rpm
container: docker.io/library/centos:7
- name: redhat
version: "8"
type: rpm
Expand Down
46 changes: 0 additions & 46 deletions .github/actions/openziti-tunnel-build-action/redhat-7/Dockerfile

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ RUN dnf install -y \
systemd-rpm-macros \
cmake-rpm-macros \
openssl-devel \
perl \
&& dnf config-manager --set-enabled powertools \
&& dnf install -y \
doxygen \
Expand All @@ -42,7 +43,7 @@ ENV VCPKG_ROOT=/usr/local/vcpkg
ENV VCPKG_FORCE_SYSTEM_BINARIES=yes

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

WORKDIR /github/workspace
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ fi
if [ ${#} -ge 2 ]; then
cmake_config="${2}"
else
cmake_config="Release"
cmake_config="RelWithDebInfo"
fi

# workspace dir for each build env is added to "safe" dirs in global config e.g.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
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 All @@ -23,6 +25,7 @@ RUN dnf install -y \
systemd-rpm-macros \
cmake-rpm-macros \
openssl-devel \
perl-FindBin perl-IPC-Cmd perl-File-Compare perl-File-Copy \
libatomic \
&& dnf config-manager --set-enabled crb \
&& dnf install -y \
Expand All @@ -43,7 +46,7 @@ ENV VCPKG_ROOT=/usr/local/vcpkg
ENV VCPKG_FORCE_SYSTEM_BINARIES=yes

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ fi
if [ ${#} -ge 2 ]; then
cmake_config="${2}"
else
cmake_config="Release"
cmake_config="RelWithDebInfo"
fi

# workspace dir for each build env is added to "safe" dirs in global config e.g.
Expand All @@ -45,6 +45,7 @@ done
--preset "${cmake_preset}" \
-DCMAKE_BUILD_TYPE="${cmake_config}" \
-DBUILD_DIST_PACKAGES=ON \
"${TLSUV_TLSLIB:+-DTLSUV_TLSLIB=${TLSUV_TLSLIB}}" \
-S . \
-B ./build
cmake \
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit df3309c

Please sign in to comment.