From ce19853d25b2e44bdf95f8afb9ab4ef47ca945d0 Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 14 May 2024 09:46:08 +0100 Subject: [PATCH 1/2] chore --- .github/workflows/gh-pages-deploy.yml | 74 +++++++++++++-------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/gh-pages-deploy.yml b/.github/workflows/gh-pages-deploy.yml index b9c28c7..70421e5 100644 --- a/.github/workflows/gh-pages-deploy.yml +++ b/.github/workflows/gh-pages-deploy.yml @@ -1,86 +1,86 @@ name: Release to Github Pages on: - push: +push: branches: [release] - workflow_dispatch: +workflow_dispatch: permissions: - contents: write # for committing to gh-pages branch. - pages: write - id-token: write +contents: write # for committing to gh-pages branch. +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 +group: "pages" +cancel-in-progress: false jobs: - Github-Pages-Release: +Github-Pages-Release: timeout-minutes: 10 environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 # repo checkout + - uses: actions/checkout@v4 # repo checkout - # Install Rust Nightly Toolchain, with Clippy & Rustfmt - - name: Install nightly Rust + # Install Rust Nightly Toolchain, with Clippy & Rustfmt + - name: Install nightly Rust uses: dtolnay/rust-toolchain@stable with: - components: clippy, rustfmt + components: clippy, rustfmt - - name: Add WASM target + - name: Add WASM target run: rustup target add wasm32-unknown-unknown - - name: lint + - name: lint run: cargo clippy & cargo fmt - # If using tailwind... - # - name: Download and install tailwindcss binary - # run: npm install -D tailwindcss && npx tailwindcss -i -o # run tailwind + # If using tailwind... + # - name: Download and install tailwindcss binary + # run: npm install -D tailwindcss && npx tailwindcss -i -o # run tailwind - - name: Download and install Trunk binary - run: wget -qO- https://github.com/trunk-rs/trunk/releases/download/v0.18.4/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- + - name: Download and install Trunk binary + run: wget -qO- https://github.com/trunk-rs/trunk/releases/download/v0.18.2/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- - - name: Build with Trunk + - name: Build with Trunk # "${GITHUB_REPOSITORY#*/}" evaluates into the name of the repository # using --public-url something will allow trunk to modify all the href paths like from favicon.ico to repo_name/favicon.ico . # this is necessary for github pages where the site is deployed to username.github.io/repo_name and all files must be requested # relatively as favicon.ico. if we skip public-url option, the href paths will instead request username.github.io/favicon.ico which # will obviously return error 404 not found. - run: cd utils-web && ./trunk build --release --public-url "${GITHUB_REPOSITORY#*/}" + run: cd utils-web && ./trunk build --release --public-url "${GITHUB_REPOSITORY#*/}" - # Deploy to gh-pages branch - # - name: Deploy 🚀 - # uses: JamesIves/github-pages-deploy-action@v4 - # with: - # folder: dist + # Deploy to gh-pages branch + # - name: Deploy 🚀 + # uses: JamesIves/github-pages-deploy-action@v4 + # with: + # folder: dist - # Deploy with Github Static Pages + # Deploy with Github Static Pages - - name: Setup Pages + - name: Setup Pages uses: actions/configure-pages@v4 with: - enablement: true - # token: + enablement: true + # token: - - name: Upload artifact + - name: Upload artifact uses: actions/upload-pages-artifact@v2 with: - # Upload dist dir - path: './dist' + # Upload dist dir + path: './dist' - - name: Deploy to GitHub Pages 🚀 + - name: Deploy to GitHub Pages 🚀 id: deployment - uses: actions/deploy-pages@v3 \ No newline at end of file + uses: actions/deploy-pages@v3 From 19234e29a64825ba972055ec5eea4df3b5bae8e1 Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 14 May 2024 09:52:39 +0100 Subject: [PATCH 2/2] release --- .github/workflows/gh-pages-deploy.yml | 105 +++++++++----------------- 1 file changed, 37 insertions(+), 68 deletions(-) diff --git a/.github/workflows/gh-pages-deploy.yml b/.github/workflows/gh-pages-deploy.yml index 70421e5..9e859e0 100644 --- a/.github/workflows/gh-pages-deploy.yml +++ b/.github/workflows/gh-pages-deploy.yml @@ -1,86 +1,55 @@ -name: Release to Github Pages +name: Test and release web on: -push: + push: branches: [release] -workflow_dispatch: + workflow_dispatch: permissions: -contents: write # for committing to gh-pages branch. -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 + contents: write # for committing to gh-pages branch. jobs: -Github-Pages-Release: - + verify: timeout-minutes: 10 - - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 # repo checkout - - # Install Rust Nightly Toolchain, with Clippy & Rustfmt - - name: Install nightly Rust - uses: dtolnay/rust-toolchain@stable + - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@nightly with: - components: clippy, rustfmt - - - name: Add WASM target - run: rustup target add wasm32-unknown-unknown - - - name: lint - run: cargo clippy & cargo fmt - - - # If using tailwind... - # - name: Download and install tailwindcss binary - # run: npm install -D tailwindcss && npx tailwindcss -i -o # run tailwind - - - - name: Download and install Trunk binary - run: wget -qO- https://github.com/trunk-rs/trunk/releases/download/v0.18.2/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- - - - name: Build with Trunk + components: clippy, rustfmt + - uses: Swatinem/rust-cache@v2 + - uses: taiki-e/install-action@v2 + with: + tool: just@1 + - run: just lint + build-github-pages: + needs: verify + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 # repo checkout + - uses: actions-rs/toolchain@v1 # get rust toolchain for wasm + with: + profile: minimal + toolchain: nightly + target: wasm32-unknown-unknown + override: true + - name: Rust Cache # cache the rust build artefacts + uses: Swatinem/rust-cache@v2 + - name: Download and install tailwindcss binary + run: npm install -D tailwindcss + - name: Download and install Trunk binary + run: wget -qO- https://github.com/thedodd/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- + - name: Build # build # "${GITHUB_REPOSITORY#*/}" evaluates into the name of the repository # using --public-url something will allow trunk to modify all the href paths like from favicon.ico to repo_name/favicon.ico . # this is necessary for github pages where the site is deployed to username.github.io/repo_name and all files must be requested # relatively as favicon.ico. if we skip public-url option, the href paths will instead request username.github.io/favicon.ico which # will obviously return error 404 not found. run: cd utils-web && ./trunk build --release --public-url "${GITHUB_REPOSITORY#*/}" - - - # Deploy to gh-pages branch - # - name: Deploy 🚀 - # uses: JamesIves/github-pages-deploy-action@v4 - # with: - # folder: dist - - - # Deploy with Github Static Pages - - - name: Setup Pages - uses: actions/configure-pages@v4 + - name: Deploy + uses: JamesIves/github-pages-deploy-action@v4 with: - enablement: true - # token: - - - name: Upload artifact - uses: actions/upload-pages-artifact@v2 - with: - # Upload dist dir - path: './dist' - - - name: Deploy to GitHub Pages 🚀 - id: deployment - uses: actions/deploy-pages@v3 + folder: dist + # this option will not maintain any history of your previous pages deployment + # set to false if you want all page build to be committed to your gh-pages branch history + single-commit: true \ No newline at end of file