Test

hopter-project · Jun 19, 2024 · 976e57d · 976e57d
1 parent 40d8541
commit 976e57d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/actions/prepare-qemu/action.yaml b/.github/workflows/actions/prepare-qemu/action.yaml
@@ -1,6 +1,11 @@
 name: Prepare QEMU
 description: "Download QEMU and add it to PATH."
 
+inputs:
+  cookie:
+    description: "Cookie for download authorization."
+    required: true
+
 runs:
   using: "composite"
   steps:
@@ -15,7 +20,7 @@ runs:
       if: steps.qemu-cache.outputs.cache-hit != 'true'
       run: >
         curl --fail -L
-             --cookie "authorized_cookie=${{ secrets.AUTHORIZED_DOWNLOAD_COOKIE }}"
+             --cookie "authorized_cookie=${{ inputs.cookie }}"
              -o qemu.tar.xz
              'https://file.zyma.me/qemu.tar.xz'
       shell: bash

diff --git a/.github/workflows/actions/prepare-rust-toolchain/action.yaml b/.github/workflows/actions/prepare-rust-toolchain/action.yaml
@@ -1,6 +1,11 @@
 name: Prepare Rust toolchain
 description: "Download and register Rust compiler toolchain."
 
+inputs:
+  cookie:
+    description: "Cookie for download authorization."
+    required: true
+
 runs:
   using: "composite"
   steps:
@@ -15,7 +20,7 @@ runs:
       if: steps.rust-cache.outputs.cache-hit != 'true'
       run: >
         curl --fail -L
-             --cookie "authorized_cookie=${{ secrets.AUTHORIZED_DOWNLOAD_COOKIE }}"
+             --cookie "authorized_cookie=${{ inputs.cookie }}"
              -o rust.tar.xz
              'https://file.zyma.me/rust.tar.xz'
       shell: bash

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -15,9 +15,13 @@ jobs:
 
       - name: Prepare Rust compiler toolchain
         uses: ./.github/workflows/actions/prepare-rust-toolchain
+        with:
+          cookie: ${{ secrets.AUTHORIZED_DOWNLOAD_COOKIE }}
 
       - name: Prepare QEMU
         uses: ./.github/workflows/actions/prepare-qemu
+        with:
+          cookie: ${{ secrets.AUTHORIZED_DOWNLOAD_COOKIE }}
 
       - name: Build Hopter
         run: cargo +segstk-rust build --release

diff --git a/.github/workflows/check-qemu.yaml b/.github/workflows/check-qemu.yaml
@@ -1,10 +1,6 @@
 name: Check QEMU
 
-on:
-  workflow_call: 
-    secrets:
-      TEST_COOKIE:
-        required: true
+on: [workflow_call]
 
 env:
   CARGO_TERM_COLOR: always
@@ -16,13 +12,11 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-
-      - name: Test secret
-        run: echo ${{ secrets.TEST_COOKIE }}
-        shell: bash
 
       - name: Prepare QEMU
         uses: ./.github/workflows/actions/prepare-qemu
+        with:
+          cookie: ${{ secrets.AUTHORIZED_DOWNLOAD_COOKIE }}
 
       - name: Verify QEMU
         run: qemu-system-arm --version

diff --git a/.github/workflows/check-rust-toolchain.yaml b/.github/workflows/check-rust-toolchain.yaml
@@ -15,6 +15,8 @@ jobs:
 
       - name: Prepare Rust compiler toolchain
         uses: ./.github/workflows/actions/prepare-rust-toolchain
+        with:
+          cookie: ${{ secrets.AUTHORIZED_DOWNLOAD_COOKIE }}
 
       - name: Verify Rust compiler toolchain registration
         run: cargo +segstk-rust --version