From 116021aae2cc7781a19bb47b4e3265bce2e45a3f Mon Sep 17 00:00:00 2001 From: Gabriel Ferreira Date: Sat, 15 Jun 2024 12:52:10 +0200 Subject: [PATCH] build: Bump required Apple Clang version for std::bind_front support --- .github/workflows/per_commit.yml | 16 ++++++++-------- CMakeLists.txt | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/per_commit.yml b/.github/workflows/per_commit.yml index df43f44cc..340b3b5da 100644 --- a/.github/workflows/per_commit.yml +++ b/.github/workflows/per_commit.yml @@ -7,7 +7,7 @@ jobs: outputs: cache_misses: ${{ env.cache_misses }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install required packages run: | sudo apt-get update @@ -21,7 +21,7 @@ jobs: run: python3 -c "from datetime import datetime; print('time='+datetime.now().strftime('%Y-%m-%d-%H-%M-%S'))" >> $GITHUB_ENV - name: Restore ccache id: ccache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: .ccache key: ubuntu-ci-${{env.time}} @@ -52,7 +52,7 @@ jobs: needs: Ubuntu if: needs.Ubuntu.outputs.cache_misses != '0' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install required packages run: | sudo apt-get update @@ -67,7 +67,7 @@ jobs: run: python3 -c "from datetime import datetime; print('time='+datetime.now().strftime('%Y-%m-%d-%H-%M-%S'))" >> $GITHUB_ENV - name: Restore ccache id: ccache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: .ccache key: ubuntu-coverage-${{env.time}} @@ -103,7 +103,7 @@ jobs: run: shell: msys2 {0} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: msys2/setup-msys2@v2 - name: Install required msys2/mingw64 packages run: | @@ -127,7 +127,7 @@ jobs: run: python3 -c "from datetime import datetime; print('time='+datetime.now().strftime('%Y-%m-%d-%H-%M-%S'))" >> $GITHUB_ENV - name: Restore ccache id: ccache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: .ccache key: msys2-${{env.time}} @@ -159,7 +159,7 @@ jobs: matrix: os: [ macos-latest, macos-12 ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install required packages run: | brew install ninja cmake ccache libxml2 gsl open-mpi #qt5 @@ -168,7 +168,7 @@ jobs: run: python3 -c "from datetime import datetime; print('time='+datetime.now().strftime('%Y-%m-%d-%H-%M-%S'))" >> $GITHUB_ENV - name: Restore ccache id: ccache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: .ccache key: osx_brew-ci-${{env.time}} diff --git a/CMakeLists.txt b/CMakeLists.txt index 8023c3828..aa8b30a08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ project(NS3 CXX C) file(STRINGS VERSION NS3_VER) # minimum compiler versions -set(AppleClang_MinVersion 11.0.0) +set(AppleClang_MinVersion 13.1.6) set(Clang_MinVersion 10.0.0) set(GNU_MinVersion 9.1.0)