tirbofish/dropbear · diff

5f69067 · tk

ci: fix docs.yaml and create_executable.yaml jarvis, run github actions

diff --git a/.github/workflows/create_executable.yaml b/.github/workflows/create_executable.yaml
index 4b651a6..c07c5ae 100644
--- a/.github/workflows/create_executable.yaml
+++ b/.github/workflows/create_executable.yaml
@@ -11,6 +11,9 @@ jobs:
     if: contains(github.event.head_commit.message, 'jarvis, run github actions')
     name: Build for ${{ matrix.os_name }}
     runs-on: ${{ matrix.os }}
+    # Export AWS_LC_SYS_PREBUILT_NASM so aws-lc-rs build script will use its prebuilt NASM binary
+    env:
+      AWS_LC_SYS_PREBUILT_NASM: "1"
     strategy:
       matrix:
         include:
@@ -34,7 +37,7 @@ jobs:
 
       - name: Install NASM (Windows)
         if: matrix.os == 'windows-latest'
-        run: choco install nasm
+        run: choco install nasm -y
 
       - name: Install NASM (Linux)
         if: matrix.os == 'ubuntu-latest'
@@ -44,6 +47,18 @@ jobs:
         if: matrix.os == 'macos-latest'
         run: brew install nasm
 
+      - name: Verify NASM (Windows)
+        if: matrix.os == 'windows-latest'
+        shell: powershell
+        run: |
+          Write-Host "AWS_LC_SYS_PREBUILT_NASM = $env:AWS_LC_SYS_PREBUILT_NASM"
+          try {
+            where.exe nasm
+            Write-Host "System NASM found."
+          } catch {
+            Write-Host "System NASM not found (this is okay if aws-lc-rs will use prebuilt NASM)."
+          }
+
       - name: Install libudev-dev (Linux)
         if: matrix.os == 'ubuntu-latest'
         run: sudo apt-get update && sudo apt-get install -y libudev-dev
@@ -62,6 +77,9 @@ jobs:
           targets: ${{ matrix.target }}
 
       - name: Build eucalyptus
+        # keep AWS_LC_SYS_PREBUILT_NASM visible to the cargo build step
+        env:
+          AWS_LC_SYS_PREBUILT_NASM: ${{ env.AWS_LC_SYS_PREBUILT_NASM }}
         run: cargo build --release --package eucalyptus --target ${{ matrix.target }}
 
       - name: Prepare artifact
@@ -84,4 +102,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: executables-${{ matrix.os_name }}
-          path: dist/
\ No newline at end of file
+          path: dist/
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index ec9f6de..9b23cc7 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -8,11 +8,11 @@ on:
 permissions:
   contents: read
   pages: write
-  id-token: write
 
 jobs:
-  build:
+  build-and-deploy:
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -35,14 +35,8 @@ jobs:
           chmod +x scripts/gen_docs.sh
           ./scripts/gen_docs.sh
 
-      - name: Upload Pages artifact
-        uses: actions/upload-pages-artifact@v1
-        with:
-          path: ./docs
-
-  deploy:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
       - name: Deploy to GitHub Pages
-        uses: actions/deploy-pages@v1
\ No newline at end of file
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.PAGES_PAT }}
+          publish_dir: ./docs
\ No newline at end of file