Skip to content

Commit

Permalink
[Build] [ciBuild] update ci config
Browse files Browse the repository at this point in the history
  • Loading branch information
Haldir65 committed Aug 28, 2024
1 parent cd13783 commit 6823bed
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/automate_build_of_repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
# llvm_version: '18.x'
# build_target: 'distribution'
- id: 'linux-amd64'
os: 'ubuntu-24.04'
os: 'ubuntu-latest'
tar_extra_args: ''
# - id: 'linux-aarch64'
# os: "ubuntu-latest"
Expand All @@ -29,10 +29,10 @@ jobs:
# os: ['self-hosted', 'linux', 'RISCV64']
## https://github.blog/changelog/2024-01-30-github-actions-introducing-the-new-m1-macos-runner-available-to-open-source/
- id: 'darwin-amd64'
os: 'macos-14'
os: 'macos-latest'
tar_extra_args: ''
- id: 'windows-amd64'
os: 'windows-2022'
os: 'windows-latest'
# When unpacking an archive on Windows, the symlinks can't be
# created unless the target path already exists. This causes
# problems when the linked file is ordered after the link
Expand All @@ -58,8 +58,8 @@ jobs:
id: cache-boost
uses: actions/cache@v4
with:
path: ronan/cmake/vendor/boost-1.85.0-cmake.tar.xz
key: ${{ runner.os }}-boost-1.85.0
path: ronan/cmake/vendor/boost-1.86.0-cmake.tar.xz
key: ${{ runner.os }}-boost-1.86.0

- name: Retrieve boost cache
if: steps.cache-boost.outputs.cache-hit != 'true'
Expand All @@ -70,7 +70,7 @@ jobs:
uses: actions/cache@v4
with:
path: ronan/build/_deps
key: ${{ runner.os }}-build_deps-v1
key: ${{ runner.os }}-build_deps-v1

# - name: Install LLVM and Clang on linux
# if: startsWith(matrix.target.id, 'linux-')
Expand All @@ -82,8 +82,8 @@ jobs:
if: startsWith(matrix.target.id, 'linux-')
shell: bash
run: |
sudo apt install libncurses5 ninja-build build-essential coreutils tree libtbb-dev -y
clang --version
sudo apt install ninja-build build-essential coreutils tree libtbb-dev -y
echo "cpu core num is "
nproc
Expand Down Expand Up @@ -198,8 +198,8 @@ jobs:
id: cache-boost
uses: actions/cache@v4
with:
path: ronan/cmake/vendor/boost-1.85.0-cmake.tar.xz
key: ${{ runner.os }}-boost-1.85.0
path: ronan/cmake/vendor/boost-1.86.0-cmake.tar.xz
key: ${{ runner.os }}-boost-1.86.0

- name: Retrieve boost cache
if: steps.cache-boost.outputs.cache-hit != 'true'
Expand All @@ -216,7 +216,7 @@ jobs:
shell: bash
run: |
apt update
apt install -y sudo ninja-build git unzip build-essential tree checkinstall zlib1g-dev libtbb-dev wget
apt install -y sudo libncurses5 ninja-build git unzip build-essential tree checkinstall zlib1g-dev libtbb-dev wget
- name: install latest version of cmake
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_curl_http3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
target:
- id: 'linux-amd64'
os: 'ubuntu-24.04'
os: 'ubuntu-latest'
# tar_extra_args: ''
# llvm_version: '18.x'
# - id: 'linux-aarch64'
Expand All @@ -27,7 +27,7 @@ jobs:
## https://github.blog/changelog/2024-01-30-github-actions-introducing-the-new-m1-macos-runner-available-to-open-source/
- id: 'darwin-amd64'
# os: 'macos-14-xlarge' ## failed
os: 'macos-14'
os: 'macos-latest'
## https://docs.github.com/en/actions/using-github-hosted-runners/about-larger-runners/about-larger-runners#about-macos-larger-runners
# tar_extra_args: ''
# llvm_version: '18.x'
Expand Down
2 changes: 1 addition & 1 deletion scripts/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function _download_if_not_exists(){
fi
}

readonly NGHTTP2_VERSION=1.62.1
readonly NGHTTP2_VERSION=1.63.0
readonly NGHTTP3_VERSION=1.5.0
readonly NGTCP2_VERSION=1.7.0
readonly PSL_VERSION=0.21.5
Expand Down

0 comments on commit 6823bed

Please sign in to comment.