From a5771eaf7b6bc37e661af866cd45dd5989f11a1b Mon Sep 17 00:00:00 2001 From: Tom Akehurst Date: Fri, 2 Feb 2024 18:01:08 +0000 Subject: [PATCH] Another attempt at getting CI working again --- .github/workflows/ci.yml | 75 ------------- .github/workflows/deploy-mkdocs-preview.yaml | 111 ------------------- .github/workflows/deploy-to-amplify.yaml | 52 --------- .github/workflows/deploy.yaml | 91 --------------- 4 files changed, 329 deletions(-) delete mode 100644 .github/workflows/ci.yml delete mode 100644 .github/workflows/deploy-mkdocs-preview.yaml delete mode 100644 .github/workflows/deploy.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 9f7c059d..00000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,75 +0,0 @@ -name: Continuous Integration - -on: - push: - # Not needed for main, we have CD there - branches: [ "2.x" ] - pull_request: - branches: [ "main", "2.x" ] - workflow_dispatch: - -jobs: - # Build job - build: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - submodules: "true" - - name: Setup Ruby - uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0 - with: - ruby-version: '2.7.6' # Not needed with a .ruby-version file - bundler: '2.4.10' - bundler-cache: false # runs 'bundle install' and caches installed gems automatically - cache-version: 3 # Increment this number if you need to re-download cached gems - - name: Setup Pages - id: pages - uses: actions/configure-pages@v3 - - name: Update RubyGems and Co - run: gem update --system - - name: Install Ruby Bundles - run: bundle install - - name: Build with Jekyll - # Outputs to the './_site' directory by default - run: bundle exec jekyll build --config '_config.yml' --baseurl "${{ steps.pages.outputs.base_path }}" - env: - JEKYLL_ENV: development - - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - - name: Install and configure Poetry - uses: snok/install-poetry@v1 - with: - version: 1.5.1 - - - name: Install dependencies - run: pip install -r requirements.txt - - - name: Build the docs - run: mkdocs build - - - name: Build 2.x with Jekyll - # Outputs to the './_site' directory by default - run: | - cd .submodules/wiremock.org-2.x - bundle exec jekyll build --config '../../_config.yml,../../_config-2.x.yml' --baseurl "${{ steps.pages.outputs.base_path }}/2.x" - env: - JEKYLL_ENV: development -# TODO: Add 3.x build? It is just a config file tweak, so maybe better to not slowdown for now - - -# TODO: Uncomment when cleaned up (if ever) -# - name: Validate HTML and links -# uses: anishathalye/proof-html@v2 -# with: -# directory: ./_site -# enforce_https: false - -# - name: Upload artifact -# # Automatically uploads an artifact from the './_site' directory by default -# uses: actions/upload-pages-artifact@v1 diff --git a/.github/workflows/deploy-mkdocs-preview.yaml b/.github/workflows/deploy-mkdocs-preview.yaml deleted file mode 100644 index 314722c1..00000000 --- a/.github/workflows/deploy-mkdocs-preview.yaml +++ /dev/null @@ -1,111 +0,0 @@ -name: Deploy Preview to GitHub Pages - -on: - # Runs on pushes targeting the default branch - push: - branches: ["main", "mkdocs"] - - # 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: - # Build job - build: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - submodules: "true" - - name: Setup Ruby - uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0 - with: - ruby-version: '2.7.6' # Not needed with a .ruby-version file - bundler: '2.4.10' - bundler-cache: false # runs 'bundle install' and caches installed gems automatically - cache-version: 3 # Increment this number if you need to re-download cached gems - - name: Setup Pages - id: pages - uses: actions/configure-pages@v3 - - name: Update RubyGems and Co - run: gem update --system - - name: Install Ruby Bundles - run: bundle install - - - name: Build with Jekyll - # Outputs to the './_site' directory by default - run: bundle exec jekyll build --config '_config.yml,_config-oleg-nenashev.yml' --baseurl "${{ steps.pages.outputs.base_path }}" - env: - JEKYLL_ENV: production - - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - - name: Install and configure Poetry - uses: snok/install-poetry@v1 - with: - version: 1.5.1 - - - name: Install dependencies - run: pip install -r requirements.txt - - - name: Build the docs site - run: mkdocs build - - - name: Build 2.x with Jekyll - # Outputs to the './_site' directory by default - run: | - cd .submodules/wiremock.org-2.x - bundle exec jekyll build --config '../../_config.yml,../../_config-2.x.yml,../../_config-oleg-nenashev-2.x.yml' --baseurl "${{ steps.pages.outputs.base_path }}" - env: - JEKYLL_ENV: production - #- name: Build 3.x with Jekyll - # We use the same as the root build, but with additional config - # run: | - # bundle exec jekyll build --config '_config.yml,_config-3.x.yml,_config-oleg-nenashev-3.x.yml' --baseurl "${{ steps.pages.outputs.base_path }}" - # env: - # JEKYLL_ENV: production - - name: Deploy version branches to the website - run: | - ruby .scripts/merge-sitemaps.rb - mkdir _site/2.x - cp -R .submodules/wiremock.org-2.x/tmp/site_2x/* _site/2.x/ - mkdir -p _site/docs - cp -R _site-docs/* _site/docs/ - mkdir -p _site/3.x/docs - cp -R _site-docs/* _site/3.x/docs/ -# TODO: Uncomment when cleaned up (if ever) -# - name: Validate HTML and links -# uses: anishathalye/proof-html@v2 -# with: -# directory: ./_site -# enforce_https: false - - name: Upload artifact - # Automatically uploads an artifact from the './_site' directory by default - uses: actions/upload-pages-artifact@v1 - - # Deployment job - deploy: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - needs: build - steps: - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v2 diff --git a/.github/workflows/deploy-to-amplify.yaml b/.github/workflows/deploy-to-amplify.yaml index 4714bbde..2e1c4289 100644 --- a/.github/workflows/deploy-to-amplify.yaml +++ b/.github/workflows/deploy-to-amplify.yaml @@ -31,42 +31,7 @@ jobs: uses: actions/checkout@v3 with: submodules: "true" - - name: Setup Ruby - uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0 - with: - ruby-version: '2.7.6' # Not needed with a .ruby-version file - bundler: '2.4.10' - bundler-cache: false # runs 'bundle install' and caches installed gems automatically - cache-version: 3 # Increment this number if you need to re-download cached gems - - name: Update RubyGems and Co - run: | - gem uninstall rubygems-update - gem install rubygems-update -v 3.4.22 - update_rubygems - gem update --system - - name: Install Ruby Bundles - run: bundle install - - - name: Build with Jekyll - # Outputs to the './_site' directory by default - run: bundle exec jekyll build --config '_config.yml' --baseurl "${{ steps.pages.outputs.base_path }}" - env: - JEKYLL_ENV: production - - name: Build 2.x with Jekyll - # Outputs to the './_site' directory by default - run: | - cd .submodules/wiremock.org-2.x - bundle exec jekyll build --config '../../_config.yml,../../_config-2.x.yml' --baseurl "${{ steps.pages.outputs.base_path }}" - env: - JEKYLL_ENV: production - - name: Build 3.x with Jekyll - # We use the same as the root build, but with additional config - run: | - bundle exec jekyll build --config '_config.yml,_config-3.x.yml' --baseurl "${{ steps.pages.outputs.base_path }}" - env: - JEKYLL_ENV: production - - name: Set up Python uses: actions/setup-python@v4 with: @@ -83,23 +48,6 @@ jobs: - name: Build the docs site run: mkdocs build - - name: Copy docs into _site - run: cp -r _site-docs _site/docs - - - name: Deploy version branches to the website - run: | - ruby .scripts/merge-sitemaps.rb - mkdir _site/2.x - cp -R .submodules/wiremock.org-2.x/tmp/site_2x/* _site/2.x/ - mkdir _site/3.x - cp -R tmp/site_3x/* _site/3.x/ -# TODO: Uncomment when cleaned up (if ever) -# - name: Validate HTML and links -# uses: anishathalye/proof-html@v2 -# with: -# directory: ./_site -# enforce_https: false - - name: Deploy to Amplify run: | bash -x ./deploy-amplify.sh diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml deleted file mode 100644 index 25f9baa8..00000000 --- a/.github/workflows/deploy.yaml +++ /dev/null @@ -1,91 +0,0 @@ -name: Deploy to GitHub Pages - -on: - # Runs on pushes targeting the default branch - push: - branches: ["main"] - - # 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: - # Build job - build: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - submodules: "true" - - name: Setup Ruby - uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0 - with: - ruby-version: '2.7.6' # Not needed with a .ruby-version file - bundler: '2.4.10' - bundler-cache: false # runs 'bundle install' and caches installed gems automatically - cache-version: 3 # Increment this number if you need to re-download cached gems - - name: Setup Pages - id: pages - uses: actions/configure-pages@v3 - - name: Update RubyGems and Co - run: gem update --system - - name: Install Ruby Bundles - run: bundle install - - name: Build with Jekyll - # Outputs to the './_site' directory by default - run: bundle exec jekyll build --config '_config.yml' --baseurl "${{ steps.pages.outputs.base_path }}" - env: - JEKYLL_ENV: production - - name: Build 2.x with Jekyll - # Outputs to the './_site' directory by default - run: | - cd .submodules/wiremock.org-2.x - bundle exec jekyll build --config '../../_config.yml,../../_config-2.x.yml' --baseurl "${{ steps.pages.outputs.base_path }}" - env: - JEKYLL_ENV: production - - name: Build 3.x with Jekyll - # We use the same as the root build, but with additional config - run: | - bundle exec jekyll build --config '_config.yml,_config-3.x.yml' --baseurl "${{ steps.pages.outputs.base_path }}" - env: - JEKYLL_ENV: production - - name: Deploy version branches to the website - run: | - ruby .scripts/merge-sitemaps.rb - mkdir _site/2.x - cp -R .submodules/wiremock.org-2.x/tmp/site_2x/* _site/2.x/ - mkdir _site/3.x - cp -R tmp/site_3x/* _site/3.x/ -# TODO: Uncomment when cleaned up (if ever) -# - name: Validate HTML and links -# uses: anishathalye/proof-html@v2 -# with: -# directory: ./_site -# enforce_https: false - - name: Upload artifact - # Automatically uploads an artifact from the './_site' directory by default - uses: actions/upload-pages-artifact@v1 - - # Deployment job - deploy: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - needs: build - steps: - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v2