Skip to content

Commit

Permalink
Upgrading to build2 0.15.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
intjftw committed Aug 31, 2022
1 parent d7ec495 commit 648d904
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ jobs:
cd $HOME
mkdir /tmp/build2src
cd /tmp/build2src
curl -sSfO https://download.build2.org/0.14.0/build2-install-0.14.0.sh
sh build2-install-0.14.0.sh --yes --trust yes "$HOME/build2_install/"
curl -sSfO https://download.build2.org/0.15.0/build2-install-0.15.0.sh
sh build2-install-0.15.0.sh --yes --trust yes "$HOME/build2_install/"
export PATH=$PATH:$HOME/build2_install/bin/
mkdir /tmp/odb_build
cd /tmp/odb_build
Expand Down
6 changes: 3 additions & 3 deletions .gitlab/build-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ if [ ! -f $DEPS_INSTALL_RUNTIME_DIR/odb-install/bin/odb ]; then
if [[ $ODB_VERSION == "2.5.0" ]]; then
# build2
cd $PACKAGES_DIR
wget --no-verbose --no-clobber https://download.build2.org/0.14.0/build2-install-0.14.0.sh
sh build2-install-0.14.0.sh --yes --trust yes --jobs $(nproc) $PACKAGES_DIR/build2-install
wget --no-verbose --no-clobber https://download.build2.org/0.15.0/build2-install-0.15.0.sh
sh build2-install-0.15.0.sh --yes --trust yes --jobs $(nproc) $PACKAGES_DIR/build2-install
export PATH=$PACKAGES_DIR/build2-install/bin:$PATH

# odb, libodb
Expand All @@ -160,7 +160,7 @@ if [ ! -f $DEPS_INSTALL_RUNTIME_DIR/odb-install/bin/odb ]; then
bpkg build libodb-pgsql --yes --quiet --jobs $(nproc)
bpkg install --all --recursive --quiet --jobs $(nproc)

rm -f $PACKAGES_DIR/build2-toolchain-0.14.0.tar.xz
rm -f $PACKAGES_DIR/build2-toolchain-0.15.0.tar.xz
elif [[ $ODB_VERSION == "2.4.0" ]]; then
# odb
cd $PACKAGES_DIR
Expand Down
4 changes: 2 additions & 2 deletions doc/deps.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ The ODB installation uses the build2 build system. (Build2 is not needed for
CodeCompass so you may delete it right after the installation of ODB.)

```bash
wget https://download.build2.org/0.14.0/build2-install-0.14.0.sh
sh build2-install-0.14.0.sh --yes --trust yes "<build2_install_dir>"
wget https://download.build2.org/0.15.0/build2-install-0.15.0.sh
sh build2-install-0.15.0.sh --yes --trust yes "<build2_install_dir>"
```

Now, utilizing the *Build2* toolchain, we can build the *ODB* compiler and
Expand Down

0 comments on commit 648d904

Please sign in to comment.