Skip to content

Commit

Permalink
Fix build script
Browse files Browse the repository at this point in the history
  • Loading branch information
edg-l committed Nov 26, 2024
1 parent 3d94eef commit 2e11f99
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 25 deletions.
22 changes: 15 additions & 7 deletions .github/workflows/document.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ on:
push:
branches:
- master
pull_request:
permissions:
contents: read
pages: write
Expand All @@ -13,14 +12,23 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/configure-pages@v5
- uses: swatinem/rust-cache@v2
- uses: actions/configure-pages@v5
- uses: homebrew/actions/setup-homebrew@master
- run: tools/setup.sh
- run: cargo doc
- run: rm target/doc/.lock
- run: sudo apt-get install -y build-essential
- run: cargo clean --doc
- run: cargo doc --document-private-items
- name: Generate index.html file
run: |
echo "<meta http-equiv=refresh content=0;url=tblgen-alt/index.html>" > target/doc/index.html
- uses: actions/upload-pages-artifact@v3
with:
path: target/doc
- uses: actions/deploy-pages@v4
if: github.ref == 'refs/heads/main'
path: ./target/doc
deploy:
needs: build
runs-on: ubuntu-latest
steps:
- name: Deploy documentation
id: pages
uses: actions/deploy-pages@v4
13 changes: 0 additions & 13 deletions .gitlab-ci.yml

This file was deleted.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ llvm18-0 = []
llvm19-0 = []

[dependencies]
thiserror = "1.0.61"
thiserror = "2.0.3"
paste = "1.0.15"

[build-dependencies]
bindgen = "0.69.4"
cc = "1.0.98"
bindgen = "0.70.1"
cc = "1.2.1"
1 change: 1 addition & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ fn run() -> Result<(), Box<dyn Error>> {
.map(|r| r.unwrap().path())
.filter(|r| r.is_file() && r.extension().unwrap() == "cpp"),
)
.cpp_link_stdlib(get_system_libcpp())
.cpp(true)
.include("cc/include")
.include(llvm_config("--includedir")?)
Expand Down
4 changes: 2 additions & 2 deletions tools/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ llvm_prefix=$(brew --prefix llvm@$llvm_version)

echo TABLEGEN_190_PREFIX=$llvm_prefix >>$GITHUB_ENV
echo PATH=$llvm_prefix/bin:$PATH >>$GITHUB_ENV
echo LIBRARY_PATH=$(brew --prefix)/lib:$LIBRARY_PATH >>$GITHUB_ENV
echo LD_LIBRARY_PATH=$(brew --prefix)/lib:$LD_LIBRARY_PATH >>$GITHUB_ENV
#echo LIBRARY_PATH=$(brew --prefix)/lib:$LIBRARY_PATH >>$GITHUB_ENV
#echo LD_LIBRARY_PATH=$(brew --prefix)/lib:$LD_LIBRARY_PATH >>$GITHUB_ENV

0 comments on commit 2e11f99

Please sign in to comment.