From 1a3439cd7580fd0203ce4c501b16579909ddc1d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20St=C3=B6lp?= <johannes.stoelp@gmail.com>
Date: Thu, 18 Jul 2024 23:14:24 +0200
Subject: enable container in gh actions (#1)

---
 .github/workflows/check.yml | 20 ++++++++++++++++----
 .github/workflows/pages.yml | 25 -------------------------
 2 files changed, 16 insertions(+), 29 deletions(-)
 delete mode 100644 .github/workflows/pages.yml

(limited to '.github/workflows')

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 3ad9a44..126fb81 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -1,4 +1,4 @@
-name: Build and Test
+name: Build, Test and generate Doc
 
 on:
   push:
@@ -8,13 +8,25 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
+  PODMAN_RUN: podman run --rm -t -v $PWD:/work -w /work ks-rs
 
 jobs:
-  build:
+  ci:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - run: make -C container
+
     - run: cargo fmt -- --check
-    - run: cargo build --verbose
-    - run: cargo test --verbose
+    - run: eval $PODMAN_RUN cargo build --verbose
+    - run: eval $PODMAN_RUN cargo test --verbose
 
+    - name: Generate doc
+      run: |
+          eval $PODMAN_RUN cargo doc --no-deps
+          echo "<meta http-equiv=\"Refresh\" content=\"0; url='llvm_kaleidoscope_rs/index.html'\"/>" > target/doc/index.html
+    - name: Upload doc to gh pages
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: ./target/doc
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
deleted file mode 100644
index 841c0c8..0000000
--- a/.github/workflows/pages.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Generate doc and upload pages
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Generate doc
-      run: |
-          cargo doc --no-deps
-          echo "<meta http-equiv=\"Refresh\" content=\"0; url='llvm_kaleidoscope_rs/index.html'\"/>" > target/doc/index.html
-    - name: Upload doc to gh pages
-      uses: peaceiris/actions-gh-pages@v3
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./target/doc
-- 
cgit v1.2.3