diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml index 12f796cb432e..4ce0c312c4e0 100644 --- a/.github/workflows/broken-links.yml +++ b/.github/workflows/broken-links.yml @@ -13,9 +13,6 @@ on: - "**/*.md" - "**.yml" - "!.github/workflows/axe.yml" - - "!.github/workflows/deploy-docker-tag.yml" - - "!.github/workflows/deploy-image.yml" - - "!.github/workflows/docker-slim.yml" - "!.github/workflows/lighthouse-badger.yml" - "!.github/workflows/prettier.yml" - "!lighthouse_results/**" diff --git a/.github/workflows/deploy-docker-tag.yml b/.github/workflows/deploy-docker-tag.yml deleted file mode 100644 index fadfff665e9a..000000000000 --- a/.github/workflows/deploy-docker-tag.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Docker Image CI (Upload Tag) - -on: - push: - tags: - - "v*" - paths: - - "bin/entry_point.sh" - - "Dockerfile" - - "Gemfile" - - "Gemfile.lock" - - "package.json" - - "package-lock.json" - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Buildx - uses: docker/setup-buildx-action@v3 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - images: amirpourmand/al-folio - - - name: Login - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build and push - uses: docker/build-push-action@v5 - with: - context: . - platforms: linux/amd64,linux/arm64/v8 - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml deleted file mode 100644 index 133f22d7d143..000000000000 --- a/.github/workflows/deploy-image.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: Docker Image CI - -on: - push: - branches: - - master - - main - paths: - - "bin/entry_point.sh" - - "Dockerfile" - - "Gemfile" - - "Gemfile.lock" - - "package.json" - - "package-lock.json" - -jobs: - build: - runs-on: ubuntu-latest - if: github.repository_owner == 'alshedivat' - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build and push - uses: docker/build-push-action@v5 - with: - context: . - push: true - platforms: linux/amd64,linux/arm64/v8 - tags: amirpourmand/al-folio diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 046ee0de770b..d0511e261f28 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,8 +3,7 @@ name: Deploy site on: push: branches: - - master - - main + - release paths: - "assets/**" - "**.html" @@ -16,9 +15,6 @@ on: - "Gemfile.lock" - "!.github/workflows/axe.yml" - "!.github/workflows/broken-links.yml" - - "!.github/workflows/deploy-docker-tag.yml" - - "!.github/workflows/deploy-image.yml" - - "!.github/workflows/docker-slim.yml" - "!.github/workflows/lighthouse-badger.yml" - "!.github/workflows/prettier.yml" - "!lighthouse_results/**" @@ -29,8 +25,7 @@ on: - "!README.md" pull_request: branches: - - master - - main + - release paths: - "assets/**" - "**.html" diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml deleted file mode 100644 index 638114fed8c3..000000000000 --- a/.github/workflows/docker-slim.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Docker Slim - -#Only trigger, when the build workflow succeeded -on: - workflow_run: - workflows: ["Docker Image CI"] - types: - - completed - -# on: -# push: -# branches: -# - 'master' - -jobs: - build: - # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#running-a-workflow-based-on-the-conclusion-of-another-workflow - if: ${{ github.event.workflow_run.conclusion == 'success' and github.repository_owner == 'alshedivat' }} - runs-on: ubuntu-latest - defaults: - run: - working-directory: ${{ github.workspace }} - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Login - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: update docker-compose - shell: bash - run: | - sed -i "s|\.:|${{ github.workspace }}:|g" ${{ github.workspace }}/docker-compose.yml - cat ${{ github.workspace }}/docker-compose.yml - - - uses: kitabisa/docker-slim-action@v1.1.1 - env: - DSLIM_PULL: true - DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml - DSLIM_TARGET_COMPOSE_SVC: jekyll - DSLIM_CONTINUE_AFTER: signal - with: - target: amirpourmand/al-folio - tag: "slim" - - # Push to the registry - - run: docker image push amirpourmand/al-folio:slim diff --git a/.github/workflows/lighthouse-badger.yml b/.github/workflows/lighthouse-badger.yml index 182517c75cb2..eb97bf589e7b 100644 --- a/.github/workflows/lighthouse-badger.yml +++ b/.github/workflows/lighthouse-badger.yml @@ -14,10 +14,10 @@ name: "Lighthouse Badger" # INPUTS as environmental variables (env) for not manually triggered workflows env: - URLS: https://alshedivat.github.io/al-folio/ + URLS: https://ajey.github.io/ TOKEN_NAME: LIGHTHOUSE_BADGER_TOKEN # If any of the following env is blank, a default value is used instead - REPO_BRANCH: "${{ github.repository }} master" # target repository & branch e.g. 'dummy/mytargetrepo main' + REPO_BRANCH: "${{ github.repository }} release" # target repository & branch e.g. 'dummy/mytargetrepo main' MOBILE_LIGHTHOUSE_PARAMS: "--only-categories=performance,accessibility,best-practices,seo --throttling.cpuSlowdownMultiplier=2" DESKTOP_LIGHTHOUSE_PARAMS: "--only-categories=performance,accessibility,best-practices,seo --preset=desktop --throttling.cpuSlowdownMultiplier=1" diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml index 60446c8db359..f39eb6ac6116 100644 --- a/.github/workflows/prettier.yml +++ b/.github/workflows/prettier.yml @@ -3,12 +3,11 @@ name: Prettier code formatter on: pull_request: branches: - - master - - main + - release push: branches: - - master - - main + - release + - develop jobs: check: