updated triplets and pipeline

Skaginn3x · Oct 9, 2023 · 8f6087b · 8f6087b
1 parent e327e86
commit 8f6087b
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 69 deletions.
diff --git a/.github/workflows/install-framework.yml b/.github/workflows/install-framework.yml
@@ -17,22 +17,24 @@ jobs:
  build:
  name: 'build and install'
  runs-on: ubuntu-22.04
- container: ghcr.io/skaginn3x/skaginn3x/framework/tfc-toolchain:sha-09328eb
+ container: ghcr.io/skaginn3x/skaginn3x/framework/tfc-toolchain:sha-f8ab815
  strategy:
  fail-fast: false
  matrix:
- triplet: [x64-linux-gcc, x64-linux-clang, arm64-linux] # x64-linux-gcc-dynamic, x64-linux-clang-dynamic
+ triplet: [x64-linux-gcc, x64-linux-clang, arm64-linux, x64-linux-gcc-dynamic, x64-linux-clang-dynamic]
  steps:
  - uses: actions/checkout@v3
- - name: Update vcpkg
- run: |
- cd /opt/vcpkg
- git pull
- - name: Test install
- run: |
- cd test
- /opt/vcpkg/bootstrap-vcpkg.sh
- /opt/vcpkg/vcpkg --triplet ${{ matrix.triplet }} install
+
+ - uses: lukka/get-cmake@latest
+ - name: Install tfc-framework with vcpkg
+ uses: lukka/run-vcpkg@v11
+ env:
+ VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
+ with:
+ runVcpkgInstall: true
+ vcpkgDirectory: '/opt/vcpkg'
+ vcpkgGitCommitId: 'be2d7f886aad895e282b59088a2dfca5f6e1c88a'
+ vcpkgJsonGlob: 'test/vcpkg.json'
 
  - name: Upload vcpkg log
  if: failure()
@@ -45,4 +47,4 @@ jobs:
  uses: actions/upload-artifact@v3
  with:
  name: vcpkg-build-fail-logs
- path: /opt/vcpkg/**/*err.log
+ path: /opt/vcpkg/**/*err.log
diff --git a/triplets/x64-linux-clang-dynamic.cmake b/triplets/x64-linux-clang-dynamic.cmake
@@ -3,27 +3,27 @@ set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE dynamic)
 set(VCPKG_CMAKE_SYSTEM_NAME Linux)
 
-find_program(CLANG-16 "clang-16")
-if(CLANG-16)
- set(CMAKE_C_COMPILER clang-16)
- set(CMAKE_CXX_COMPILER clang++-16)
+find_program(CLANG-17 "clang-17")
+if(CLANG-17)
+ set(CMAKE_C_COMPILER clang-17)
+ set(CMAKE_CXX_COMPILER clang++-17)
  set(CMAKE_CXX_FLAGS "-stdlib=libc++")
- set(LINK_FLAGS "-fuse-ld=lld")
+ set(LINK_FLAGS "-fuse-ld=lld -stdlib=libc++")
 
- set(ENV{CC} clang-16)
- set(ENV{CXX} clang++-16)
+ set(ENV{CC} clang-17)
+ set(ENV{CXX} clang++-17)
  set(ENV{CXXFLAGS} "-stdlib=libc++")
- set(ENV{LDFLAGS} "-fuse-ld=lld")
+ set(ENV{LDFLAGS} "-fuse-ld=lld -stdlib=libc++")
 else()
- set(CMAKE_C_COMPILER /opt/clang-16.0.0/bin/clang)
- set(CMAKE_CXX_COMPILER /opt/clang-16.0.0/bin/clang++)
- set(CMAKE_CXX_FLAGS "-stdlib=libc++ -I/opt/clang-16.0.0/include/ -I/opt/clang-16.0.0/include/x86_64-unknown-linux-gnu/c++/v1")
- set(LINK_FLAGS "-fuse-ld=lld")
+ set(CMAKE_C_COMPILER /opt/clang-17.0.1/bin/clang)
+ set(CMAKE_CXX_COMPILER /opt/clang-17.0.1/bin/clang++)
+ set(CMAKE_CXX_FLAGS "-stdlib=libc++ -I/opt/clang-17.0.1/include/ -I/opt/clang-17.0.1/include/x86_64-unknown-linux-gnu/c++/v1")
+ set(LINK_FLAGS "-fuse-ld=lld -stdlib=libc++")
 
- set(ENV{CC} /opt/clang-16.0.0/bin/clang)
- set(ENV{CXX} /opt/clang-16.0.0/bin/clang++)
- set(ENV{CXXFLAGS} "-stdlib=libc++ -I/opt/clang-16.0.0/include/ -I/opt/clang-16.0.0/include/x86_64-unknown-linux-gnu/c++/v1")
- set(ENV{LDFLAGS} "-fuse-ld=lld")
+ set(ENV{CC} /opt/clang-17.0.1/bin/clang)
+ set(ENV{CXX} /opt/clang-17.0.1/bin/clang++)
+ set(ENV{CXXFLAGS} "-stdlib=libc++ -I/opt/clang-17.0.1/include/ -I/opt/clang-17.0.1/include/x86_64-unknown-linux-gnu/c++/v1")
+ set(ENV{LDFLAGS} "-fuse-ld=lld -stdlib=libc++")
 endif ()
 
 set(VCPKG_FIXUP_ELF_RPATH ON)
diff --git a/triplets/x64-linux-clang.cmake b/triplets/x64-linux-clang.cmake
@@ -3,25 +3,25 @@ set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_CMAKE_SYSTEM_NAME Linux)
 
-find_program(CLANG-16 "clang-16")
-if(CLANG-16)
- set(CMAKE_C_COMPILER clang-16)
- set(CMAKE_CXX_COMPILER clang++-16)
+find_program(CLANG-17 "clang-17")
+if(CLANG-17)
+ set(CMAKE_C_COMPILER clang-17)
+ set(CMAKE_CXX_COMPILER clang++-17)
  set(CMAKE_CXX_FLAGS "-stdlib=libc++")
- set(LINK_FLAGS "-fuse-ld=lld")
+ set(LINK_FLAGS "-fuse-ld=lld -stdlib=libc++")
 
- set(ENV{CC} clang-16)
- set(ENV{CXX} clang++-16)
+ set(ENV{CC} clang-17)
+ set(ENV{CXX} clang++-17)
  set(ENV{CXXFLAGS} "-stdlib=libc++")
- set(ENV{LDFLAGS} "-fuse-ld=lld")
+ set(ENV{LDFLAGS} "-fuse-ld=lld -stdlib=libc++")
 else()
- set(CMAKE_C_COMPILER /opt/clang-16.0.0/bin/clang)
- set(CMAKE_CXX_COMPILER /opt/clang-16.0.0/bin/clang++)
- set(CMAKE_CXX_FLAGS "-stdlib=libc++ -I/opt/clang-16.0.0/include/ -I/opt/clang-16.0.0/include/x86_64-unknown-linux-gnu/c++/v1")
- set(LINK_FLAGS "-fuse-ld=lld")
+ set(CMAKE_C_COMPILER /opt/clang-17.0.1/bin/clang)
+ set(CMAKE_CXX_COMPILER /opt/clang-17.0.1/bin/clang++)
+ set(CMAKE_CXX_FLAGS "-stdlib=libc++ -I/opt/clang-17.0.1/include/ -I/opt/clang-17.0.1/include/x86_64-unknown-linux-gnu/c++/v1")
+ set(LINK_FLAGS "-fuse-ld=lld -stdlib=libc++")
 
- set(ENV{CC} /opt/clang-16.0.0/bin/clang)
- set(ENV{CXX} /opt/clang-16.0.0/bin/clang++)
- set(ENV{CXXFLAGS} "-stdlib=libc++ -I/opt/clang-16.0.0/include/ -I/opt/clang-16.0.0/include/x86_64-unknown-linux-gnu/c++/v1")
- set(ENV{LDFLAGS} "-fuse-ld=lld")
-endif ()
+ set(ENV{CC} /opt/clang-17.0.1/bin/clang)
+ set(ENV{CXX} /opt/clang-17.0.1/bin/clang++)
+ set(ENV{CXXFLAGS} "-stdlib=libc++ -I/opt/clang-17.0.1/include/ -I/opt/clang-17.0.1/include/x86_64-unknown-linux-gnu/c++/v1")
+ set(ENV{LDFLAGS} "-fuse-ld=lld -stdlib=libc++")
+endif ()
diff --git a/triplets/x64-linux-gcc-alpine.cmake b/triplets/x64-linux-gcc-alpine.cmake
diff --git a/triplets/x64-linux-gcc-dynamic.cmake b/triplets/x64-linux-gcc-dynamic.cmake
@@ -6,11 +6,11 @@ set(VCPKG_CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_C_COMPILER gcc)
 set(CMAKE_CXX_COMPILER g++)
 set(CMAKE_C_FLAGS "")
-set(LINK_FLAGS "-fuse-ld=lld")
+set(LINK_FLAGS "")
 
 set(ENV{CC} gcc)
 set(ENV{CXX} g++)
 set(ENV{CFLAGS} "")
-set(ENV{LDFLAGS} -fuse-ld=lld)
+set(ENV{LDFLAGS} "")
 
 set(VCPKG_FIXUP_ELF_RPATH ON)