Skip to content

Commit

Permalink
Merge pull request #10 from jacob-hughes/move_to_ghmqs
Browse files Browse the repository at this point in the history
Move to GHMQs
  • Loading branch information
ltratt authored Jan 19, 2024
2 parents 53239d3 + 74c735e commit 46fcf48
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 11 deletions.
21 changes: 21 additions & 0 deletions .buildbot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,24 @@ mkdir out && cd out
cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=OFF -Denable_parallel_mark=ON -Dbuild_tests=ON -Denable_gc_assertions=ON ../
make -j
ctest

# Build alloy and test it against our BDWGC fork

cd ../

export CARGO_HOME="`pwd`/.cargo"
export RUSTUP_HOME="`pwd`/.rustup"

curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh
sh rustup.sh --default-host x86_64-unknown-linux-gnu \
--default-toolchain nightly \
--no-modify-path \
--profile minimal \
-y
export PATH=`pwd`/.cargo/bin/:$PATH
BDWGC_SRC=`pwd`

git clone https://github.com/softdevteam/alloy
cd alloy
BDWGC=${BDWGC_SRC} ENABLE_GC_ASSERTIONS=true /usr/bin/time -v python3 x.py test --stage 2 \
--config .buildbot.config.toml --exclude rustdoc-json --exclude debuginfo
2 changes: 1 addition & 1 deletion .buildbot_dockerfile_debian
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM debian:bullseye
ARG CI_UID
RUN useradd -m -u ${CI_UID} ci
RUN apt-get update && \
apt-get -y install build-essential curl cmake python3 git
apt-get -y install build-essential curl cmake python3 git ninja-build time autoconf libtool libssl-dev
WORKDIR /ci
RUN chown ${CI_UID}:${CI_UID} .
COPY --chown=${CI_UID}:${CI_UID} . .
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/sdci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
on:
pull_request:
merge_group:

# This is required to silence emails about the workflow having no jobs.
# We simply define a dummy job that does nothing much.
jobs:
dummy:
runs-on: ubuntu-latest
steps:
- run: /usr/bin/true
10 changes: 0 additions & 10 deletions bors.toml

This file was deleted.

0 comments on commit 46fcf48

Please sign in to comment.