From e8eb1f427e72d797e10a7e35e228eec0cca8262d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Garc=C3=ADa=20Isa=C3=ADa?= Date: Thu, 22 Aug 2024 17:00:12 -0300 Subject: [PATCH 1/2] Drop the old domain The old flattenthecurve.com domain is now serving ads, so this commit reverts the Github site to work on an InSTEDD's subdomain. --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index 5f76e1cec..ff01bc529 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -www.flattenthecurve.com +flattenthecurve.instedd.org From 3796c362e5c3438b129d08bf954dd75578315ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Garc=C3=ADa=20Isa=C3=ADa?= Date: Tue, 17 Sep 2024 15:07:40 -0300 Subject: [PATCH 2/2] Update deprecated build steps Use newer Github Actions runners, actions, and replace docker-compose with docker compose (v2) --- .github/workflows/import-new-resources.yml | 6 +++--- .github/workflows/preview-translations.yml | 10 +++++----- .github/workflows/preview.yml | 8 ++++---- .github/workflows/publish.yml | 14 +++++++------- CONTRIBUTING.md | 2 +- import-translations.sh | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/import-new-resources.yml b/.github/workflows/import-new-resources.yml index 6be9f7e00..c59b61e87 100644 --- a/.github/workflows/import-new-resources.yml +++ b/.github/workflows/import-new-resources.yml @@ -7,13 +7,13 @@ on: - cron: '0 */6 * * *' jobs: import_resources: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Run resource import script run: ./_scripts/import_resources.py - name: Create pull request - uses: peter-evans/create-pull-request@v2 + uses: peter-evans/create-pull-request@v7 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Import new resources. diff --git a/.github/workflows/preview-translations.yml b/.github/workflows/preview-translations.yml index 56e31a62a..e17979c99 100644 --- a/.github/workflows/preview-translations.yml +++ b/.github/workflows/preview-translations.yml @@ -5,10 +5,10 @@ on: jobs: pull_push_preview: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v1 - - uses: actions/cache@v1 + - uses: actions/checkout@v4 + - uses: actions/cache@v4 with: path: ~/cache/bundle key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} @@ -32,8 +32,8 @@ jobs: - name: Build Jekyll site run: | mv docker-compose.ci.yml docker-compose.override.yml - docker-compose run --rm web /bin/bash -c "(bundle check || bundle install --jobs=3) && bundle exec jekyll build" - - uses: amondnet/vercel-action@v19 + docker compose run --rm web /bin/bash -c "(bundle check || bundle install --jobs=3) && bundle exec jekyll build" + - uses: amondnet/vercel-action@v25 with: vercel-token: ${{ secrets.ZEIT_TOKEN }} zeit-team-id: ${{ secrets.ZEIT_TEAM_ID }} diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index b9139071d..8f0be4081 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -8,10 +8,10 @@ on: jobs: build_and_deploy: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v1 - - uses: actions/cache@v1 + - uses: actions/checkout@v4 + - uses: actions/cache@v4 with: path: ~/cache/bundle key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} @@ -20,7 +20,7 @@ jobs: - name: Build Jekyll site run: | mv docker-compose.ci.yml docker-compose.override.yml - docker-compose run --rm web /bin/bash -c "(bundle check || bundle install --jobs=3) && bundle exec jekyll build" + docker compose run --rm web /bin/bash -c "(bundle check || bundle install --jobs=3) && bundle exec jekyll build" - uses: amondnet/now-deployment@v2 with: zeit-token: ${{ secrets.ZEIT_TOKEN }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 910122f5b..9169fdb69 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,10 +7,10 @@ on: jobs: build_and_deploy: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v1 - - uses: actions/cache@v1 + - uses: actions/checkout@v4 + - uses: actions/cache@v4 with: path: ~/cache/bundle key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} @@ -19,7 +19,7 @@ jobs: - name: Build Jekyll site run: | mv docker-compose.ci.yml docker-compose.override.yml - docker-compose run --rm web /bin/bash -c "(bundle check || bundle install --jobs=3) && JEKYLL_ENV=production bundle exec jekyll build" + docker compose run --rm web /bin/bash -c "(bundle check || bundle install --jobs=3) && JEKYLL_ENV=production bundle exec jekyll build" - name: Publish to gh-pages branch env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -27,17 +27,17 @@ jobs: GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} run: ./_scripts/push-to-gh-pages.sh - name: Upload English content - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: english-content path: build/i18n-en.json publish_to_lokalise: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: build_and_deploy steps: - name: Download English content - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: english-content - name: Push English content to Lokalise diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 19be801ff..d728443b6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -70,5 +70,5 @@ We're trying to grow this documentation as fast as we can. This website is based #### Running the project locally 1. Clone the project. -1. Run `docker-compose up`. +1. Run `docker compose up`. 1. In a browser, go to `http://localhost:4000`. The site should be running there. diff --git a/import-translations.sh b/import-translations.sh index e95573820..869b51e2a 100755 --- a/import-translations.sh +++ b/import-translations.sh @@ -8,6 +8,6 @@ # # This command will generate the _translations/.json files and the _content/ -docker-compose run \ +docker compose run \ --rm web \ /bin/bash -c "(bundle check || bundle install --jobs=3) && ruby import_language.rb $1 $2"