Skip to content

Commit a55dade

Browse files
caovccaovc
authored
Merge branch 'freeCodeCamp:main' into main
2 parents cdfffd6 + 8b3f552 commit a55dade

File tree

233 files changed

+2335
-683
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+2335
-683
lines changed

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,21 @@ on:
88
jobs:
99
deploy:
1010
name: Deploy to Heroku
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-24.04
1212
if: github.repository == 'freeCodeCamp/devdocs'
1313
steps:
1414
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
1515
- name: Set up Ruby
16-
uses: ruby/setup-ruby@7bae1d00b5db9166f4f0fc47985a3a5702cb58f0 # v1.197.0
16+
uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
1717
with:
1818
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
1919
- name: Run tests
2020
run: bundle exec rake
21+
- name: Install Heroku CLI
22+
run: |
23+
curl https://cli-assets.heroku.com/install.sh | sh
2124
- name: Deploy to Heroku
22-
uses: akhileshns/heroku-deploy@581dd286c962b6972d427fcf8980f60755c15520 # v3.13.15
25+
uses: akhileshns/heroku-deploy@e3eb99d45a8e2ec5dca08735e089607befa4bf28 # v3.14.15
2326
with:
2427
heroku_api_key: ${{secrets.HEROKU_API_KEY}}
2528
heroku_app_name: "devdocs"

‎.github/workflows/docker-build.yml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Build and Push Docker Images
2+
on:
3+
schedule:
4+
- cron: '0 0 1 * *' # Run monthly on the 1st
5+
workflow_dispatch: # Allow manual triggers
6+
env:
7+
REGISTRY: ghcr.io
8+
IMAGE_NAME: ${{ github.repository }}
9+
jobs:
10+
build-and-push:
11+
runs-on: ubuntu-latest
12+
permissions:
13+
contents: read
14+
packages: write
15+
strategy:
16+
matrix:
17+
variant:
18+
- name: regular
19+
file: Dockerfile
20+
suffix: ''
21+
- name: alpine
22+
file: Dockerfile-alpine
23+
suffix: '-alpine'
24+
25+
steps:
26+
- name: Checkout repository
27+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
28+
with:
29+
persist-credentials: false
30+
31+
- name: Log in to the Container registry
32+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
33+
with:
34+
registry: ${{ env.REGISTRY }}
35+
username: ${{ github.actor }}
36+
password: ${{ secrets.GITHUB_TOKEN }}
37+
38+
- name: Extract metadata for Docker
39+
id: meta
40+
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5
41+
with:
42+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
43+
tags: |
44+
type=raw,value=latest${{ matrix.variant.suffix }}
45+
type=raw,value={{date 'YYYYMMDD'}}${{ matrix.variant.suffix }}
46+
47+
- name: Build and push image
48+
uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5
49+
with:
50+
context: .
51+
file: ./${{ matrix.variant.file }}
52+
push: true
53+
tags: ${{ steps.meta.outputs.tags }}
54+
labels: ${{ steps.meta.outputs.labels }}

‎.github/workflows/schedule-doc-report.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ on:
66

77
jobs:
88
report:
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-24.04
1010
if: github.repository == 'freeCodeCamp/devdocs'
1111
steps:
1212
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
1313
- name: Set up Ruby
14-
uses: ruby/setup-ruby@7bae1d00b5db9166f4f0fc47985a3a5702cb58f0 # v1.197.0
14+
uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
1515
with:
1616
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
1717
- name: Generate report

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1313
- name: Set up Ruby
14-
uses: ruby/setup-ruby@7bae1d00b5db9166f4f0fc47985a3a5702cb58f0 # v1.197.0
14+
uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
1515
with:
1616
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
1717
- name: Run tests

‎.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.5
1+
3.4.4

‎.tool-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby 3.3.5
1+
ruby 3.4.4

‎COPYRIGHT‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2013-2024 Thibaut Courouble and other contributors
1+
Copyright 2013-2025 Thibaut Courouble and other contributors
22

33
This Source Code Form is subject to the terms of the Mozilla Public
44
License, v. 2.0. If a copy of the MPL was not distributed with this

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.3.5
1+
FROM ruby:3.4.4
22
ENV LANG=C.UTF-8
33
ENV ENABLE_SERVICE_WORKER=true
44

‎Dockerfile-alpine‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.3.5-alpine
1+
FROM ruby:3.4.4-alpine
22

33
ENV LANG=C.UTF-8
44
ENV ENABLE_SERVICE_WORKER=true

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
2-
ruby '3.3.5'
2+
ruby '3.4.4'
33

44
gem 'activesupport', require: false
55
gem 'html-pipeline'

0 commit comments

Comments
 (0)