Skip to content

Commit

Permalink
Update CI scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
chocolacula committed Jul 19, 2023
1 parent 72c1391 commit 38856fa
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v2
# other submodules are:
# vcpkg - already installed at the virtual environment
# generator/llvm-project - too heavy, download and use generator binary
- run: git submodule update --init library/RE-flex

# - name: Get version
# run: echo "VERSION=$(python ./version.py get -f vcpkg.json)" >> $GITHUB_ENV
Expand All @@ -36,7 +32,6 @@ jobs:
run: >
cmake -B ${{ github.workspace }}/build
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}
-DCMAKE_TOOLCHAIN_FILE=${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake
- name: Install generator
run: |
Expand Down
6 changes: 1 addition & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ FROM ubuntu:22.04
# - installed Ninja build system
# it's also a valid setup for non ARM build

# zlib1g-dev - only for static builds

ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y git g++ make ninja-build cmake pkg-config \
build-essential tar curl zip unzip zlib1g-dev \
build-essential tar curl zip unzip \
llvm-15-dev libclang-15-dev libclang-cpp15-dev

COPY . ./reflection_cpp
Expand All @@ -20,10 +18,8 @@ ENV VCPKG_FORCE_SYSTEM_BINARIES=1

# build with GCC by default
RUN cd reflection_cpp \
&& git submodule update --init --recursive \
&& mkdir build && cd build \
&& cmake .. \
-DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake \
-DCMAKE_BUILD_TYPE=Release \
&& cmake --build .

Expand Down

0 comments on commit 38856fa

Please sign in to comment.