diff --git a/.gitea/workflows/Build.yml b/.gitea/workflows/Build.yml index 5598ab3..33e23cb 100644 --- a/.gitea/workflows/Build.yml +++ b/.gitea/workflows/Build.yml @@ -24,12 +24,6 @@ jobs: - name: Generating docs run: zig build docs - - name: Prepare docs deploy payload - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} - run: | - mkdir -p ./deploy-docs - cp ./zig-out/docs/index.html ./deploy-docs/404.html - - name: Deploying docs if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} uses: milanmk/actions-file-deployer@master @@ -39,6 +33,6 @@ jobs: remote-user: ${{ secrets.SFTP_USER_DOCS }} remote-password: ${{ secrets.SFTP_PASSWORD_DOCS }} remote-port: 6969 - local-path: "./deploy-docs" - remote-path: "/www/error" + local-path: "./zig-out/docs" + remote-path: "/www" sync: full diff --git a/.gitea/workflows/CTS.yml b/.gitea/workflows/CTS_Soft.yml similarity index 50% rename from .gitea/workflows/CTS.yml rename to .gitea/workflows/CTS_Soft.yml index f2f4d42..cce756c 100644 --- a/.gitea/workflows/CTS.yml +++ b/.gitea/workflows/CTS_Soft.yml @@ -1,4 +1,4 @@ -name: CTS +name: CTS Soft on: workflow_dispatch: @@ -9,10 +9,10 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: https://codeberg.org/mlugg/setup-zig@v2 - - uses: actions/setup-node@v6 with: - node-version: 24 + fetch-depth: 0 + + - uses: https://codeberg.org/mlugg/setup-zig@v2 - name: Install system dependencies run: | apt update @@ -22,7 +22,7 @@ jobs: uses: dtolnay/rust-toolchain@stable with: toolchain: stable - targets: x86_64-unknown-linux-gnu,wasm32-unknown-unknown + targets: x86_64-unknown-linux-gnu - uses: Swatinem/rust-cache@v2 with: @@ -32,13 +32,6 @@ jobs: - name: Install cargo tools uses: cargo-bins/cargo-binstall@main - - name: Install Dioxus - shell: bash - run: | - source $HOME/.cargo/env - cargo binstall dioxus-cli --no-confirm --force --version 0.7.9 - echo "$HOME/.cargo/bin" >> $GITHUB_PATH - - name: Install deqp-runner run: cargo install deqp-runner @@ -47,7 +40,6 @@ jobs: run: | source $HOME/.cargo/env echo "Verifying tool installations..." - which dx && dx --version || echo "dioxus-cli not found" which deqp-runner && deqp-runner --version || echo "deqp-runner not found" - name: Run Vulkan CTS @@ -57,21 +49,20 @@ jobs: - name: Verify tests run: ls cts | grep "results.csv"; - - name: Cloning CTS viewer - run: git clone https://git.kbz8.me/kbz_8/VulkanCTSViewer.git - - - name: Build CTS viewer - env: - URL: https://vulkan-driver-cts-report.kbz8.me/ + - name: Archiving results run: | - cd VulkanCTSViewer - zip ./assets/results.zip ../cts/results.csv - dx build --verbose --platform web --release + mkdir -p assets/ + zip ./assets/results.zip ./cts/results.csv - - name: Publish to Cloudflare Pages - uses: cloudflare/wrangler-action@v3 + - name: Deploying CTS results + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} + uses: milanmk/actions-file-deployer@master with: - apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} - accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - command: pages deploy VulkanCTSViewer/target/dx/vulkan-cts-analyzer/release/web/public --project-name=vulkan-driver-cts-report - gitHubToken: ${{ secrets.GITHUB_TOKEN }} + remote-protocol: sftp + remote-host: ${{ secrets.SFTP_HOST_CTS_SOFT }} + remote-user: ${{ secrets.SFTP_USER_CTS_SOFT }} + remote-password: ${{ secrets.SFTP_PASSWORD_CTS_SOFT }} + remote-port: 6969 + local-path: "./assets" + remote-path: "/www/assets" + sync: full