diff --git a/.github/workflows/deploy-docker-tag.yml b/.github/workflows/deploy-docker-tag.yml index 3e6b6a3a169f..e101aa4b4e47 100644 --- a/.github/workflows/deploy-docker-tag.yml +++ b/.github/workflows/deploy-docker-tag.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Buildx uses: docker/setup-buildx-action@v1 diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml index b747dfc1d15c..883ac2d8f8b7 100644 --- a/.github/workflows/deploy-image.yml +++ b/.github/workflows/deploy-image.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Buildx uses: docker/setup-buildx-action@v1 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0301f08040fc..5d2be6f71258 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -9,34 +9,29 @@ on: branches: - master - main + workflow_dispatch: + +permissions: + contents: write jobs: deploy: runs-on: ubuntu-latest steps: - - name: Checkout code + - name: Checkout 🛎️ uses: actions/checkout@v3 - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.0.2' + ruby-version: '3.2.1' bundler-cache: true - - name: Install deps + - name: Install and Build 🔧 run: | npm install -g mermaid.cli - - name: Setup deploy options - id: setup - run: | - git config --global user.name "GitHub Action" - git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" - if [[ ${GITHUB_REF} = refs/pull/*/merge ]]; then # pull request - echo "SRC_BRANCH=${GITHUB_HEAD_REF}" >> $GITHUB_OUTPUT - echo "NO_PUSH=--no-push" >> $GITHUB_OUTPUT - elif [[ ${GITHUB_REF} = refs/heads/* ]]; then # branch, e.g. master, source etc - echo "SRC_BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT - fi - echo "DEPLOY_BRANCH=gh-pages" >> $GITHUB_OUTPUT - - name: Deploy website - run: yes | bash bin/deploy --verbose ${{ steps.setup.outputs.NO_PUSH }} - --src ${{ steps.setup.outputs.SRC_BRANCH }} - --deploy ${{ steps.setup.outputs.DEPLOY_BRANCH }} + bundle exec jekyll build + - name: Deploy 🚀 + if: github.event_name != 'pull_request' + uses: JamesIves/github-pages-deploy-action@v4 + with: + folder: _site + diff --git a/README.md b/README.md index 46d92678dca1..0e7f3d934389 100644 --- a/README.md +++ b/README.md @@ -259,11 +259,7 @@ Starting version [v0.3.5](https://github.com/alshedivat/al-folio/releases/tag/v0
(click to expand) Manual deployment to GitHub Pages: -If you need to manually re-deploy your website to GitHub pages, run the deploy script from the root directory of your repository: -```bash -$ ./bin/deploy -``` -uses the `master` branch for the source code and deploys the webpage to `gh-pages`. +If you need to manually re-deploy your website to GitHub pages, go to Actions, click "Deploy" in the left sidebar, then "Run workflow."