From 99d8680e6198f3f60a8fb7a14bb7d8b732534106 Mon Sep 17 00:00:00 2001 From: Ilya Sakharchuk Date: Tue, 27 Feb 2024 16:13:45 +0300 Subject: [PATCH] aaa --- .github/workflows/cd.yml | 16 +++++++---- .github/workflows/static.yml | 54 ------------------------------------ 2 files changed, 11 insertions(+), 59 deletions(-) delete mode 100644 .github/workflows/static.yml diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 8d16836..65b73b4 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -17,12 +17,18 @@ jobs: - uses: jetli/trunk-action@v0.1.0 - uses: jetli/wasm-bindgen-action@v0.1.0 - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v4 - run: trunk build --release - - uses: peaceiris/actions-gh-pages@v3 - if: github.ref == 'refs/heads/main' + - name: Setup Pages + uses: actions/configure-pages@v4 + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./dist \ No newline at end of file + # Upload entire repository + path: './dist' + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml deleted file mode 100644 index 78179e2..0000000 --- a/.github/workflows/static.yml +++ /dev/null @@ -1,54 +0,0 @@ -# Simple workflow for deploying static content to GitHub Pages -name: Deploy static content to Pages - -on: - workflow_run: - branches: [main] - workflows: [Continuous integration] - types: [completed] - - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages -permissions: - contents: read - pages: write - id-token: write - -# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. -# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. -concurrency: - group: "pages" - cancel-in-progress: false - -jobs: - # Single deploy job since we're just deploying - deploy: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: wasm32-unknown-unknown - - - uses: jetli/trunk-action@v0.1.0 - - uses: jetli/wasm-bindgen-action@v0.1.0 - - - name: Setup Pages - uses: actions/configure-pages@v4 - - name: Upload artifact - uses: actions/upload-pages-artifact@v3 - with: - # Upload entire repository - path: '.' - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v4