Skip to content

Commit 2f936ca

Browse files
JacobCoffeeJacobCoffee
authored
Merge branch 'main' into pr-combinator-option2
2 parents 2d52f7c + 47e192c commit 2f936ca

Some content is hidden

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

60 files changed

+1604
-1073
lines changed

‎.github/ISSUE_TEMPLATE/BUG.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
name: "Bug Report"
2-
description: Report a bug with pyton.org website to help us improve
2+
description: Report a bug with python.org website to help us improve
33
title: "Bug: <title>"
44
labels: ["bug", "Triage Required"]
55

66
body:
77
- type: markdown
88
attributes:
99
value: |
10-
This is the repository and issue tracker for the https://www.pyton.org website.
10+
This is the repository and issue tracker for the https://www.python.org website.
1111
1212
If you're looking to file an issue with CPython itself, please click here: [CPython Issues](https://github.com/python/cpython/issues/new/choose).
1313

‎.github/ISSUE_TEMPLATE/DOCS.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ body:
77
- type: markdown
88
attributes:
99
value: |
10-
This is the repository and issue tracker for the https://www.pyton.org website.
10+
This is the repository and issue tracker for the https://www.python.org website.
1111
1212
If you're looking to file an issue with CPython itself, please click here: [CPython Issues](https://github.com/python/cpython/issues/new/choose).
1313

‎.github/ISSUE_TEMPLATE/REQUEST.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
name: "Feature Request"
2-
description: Suggest an idea for www.pyton.org
2+
description: Suggest an idea for www.python.org
33
title: "Enhancement: <title>"
44
labels: ["enhancement"]
55

66
body:
77
- type: markdown
88
attributes:
99
value: |
10-
This is the repository and issue tracker for the https://www.pyton.org website.
10+
This is the repository and issue tracker for the https://www.python.org website.
1111
1212
If you're looking to file an issue with CPython itself, please click here: [CPython Issues](https://github.com/python/cpython/issues/new/choose).
1313

‎.github/dependabot.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ updates:
2020
- 0.13.0
2121
- 0.13.1
2222
- 0.13.2
23+
- dependency-name: "boto3"
24+
- dependency-name: "boto3-stubs"
25+
- dependency-name: "botocore"
26+
- dependency-name: "botocore-stubs"
2327
- dependency-name: lxml
2428
versions:
2529
- 4.6.2

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: CI
22
on: [push, pull_request]
33
jobs:
44
test:
5+
# Avoid running CI more than once on pushes to main repo open PRs
6+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
57
runs-on: ubuntu-latest
68
services:
79
postgres:

‎.github/workflows/deployminder.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Deploy Reminder
2+
3+
on:
4+
pull_request:
5+
types:
6+
- closed
7+
branches:
8+
- main
9+
10+
jobs:
11+
remind:
12+
if: github.event.pull_request.merged == true
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout code
16+
uses: actions/checkout@v4
17+
with:
18+
fetch-depth: 0
19+
20+
- name: Check for changes in infra/
21+
id: check_changes
22+
run: |
23+
git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} | grep -q '^infra/'
24+
echo "has_infra_changes=$?" >> $GITHUB_OUTPUT
25+
26+
- name: Comment on PR
27+
if: steps.check_changes.outputs.has_infra_changes == '0'
28+
uses: actions/github-script@v7
29+
with:
30+
github-token: ${{secrets.GITHUB_TOKEN}}
31+
script: |
32+
github.rest.issues.createComment({
33+
issue_number: context.issue.number,
34+
owner: context.repo.owner,
35+
repo: context.repo.repo,
36+
body: 'Changes detected in the `infra/` directory. Don\'t forget to apply these changes in Terraform Cloud and/or Fastly!'
37+
})

‎.github/workflows/static.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: Check collectstatic
22
on: [push, pull_request]
33
jobs:
4-
test:
4+
collectstatic:
5+
# Avoid running CI more than once on pushes to main repo open PRs
6+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
57
runs-on: ubuntu-latest
68
steps:
79
- name: Check out repository

‎Dockerfile.static‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
FROM ruby:2.7.8-bullseye AS static
2+
3+
RUN mkdir /code
4+
WORKDIR /code
5+
6+
COPY Gemfile Gemfile.lock /code/
7+
8+
RUN bundle install
9+
10+
COPY . /code

‎Gemfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
source "https://rubygems.org"
22

33
group :media do
4-
gem "compass", "~>0.12.2"
5-
gem "sass", "~>3.2.5"
6-
gem "susy", "~>1.0.5"
4+
gem "compass", "~>0.12.7"
5+
gem "sass", "~>3.2.19"
6+
gem "susy", "~>1.0.9"
77
end
88

99
group :development do

‎Gemfile.lock‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
chunky_png (1.2.7)
5-
compass (0.12.2)
4+
chunky_png (1.4.0)
5+
compass (0.12.7)
66
chunky_png (~> 1.2)
77
fssm (>= 0.2.7)
8-
sass (~> 3.1)
8+
sass (~> 3.2.19)
99
foreman (0.61.0)
1010
thor (>= 0.13.6)
1111
fssm (0.2.10)
12-
sass (3.2.6)
13-
susy (1.0.5)
12+
sass (3.2.19)
13+
susy (1.0.9)
1414
compass (>= 0.12.2)
1515
sass (>= 3.2.0)
1616
thor (0.17.0)
@@ -19,7 +19,10 @@ PLATFORMS
1919
ruby
2020

2121
DEPENDENCIES
22-
compass (~> 0.12.2)
22+
compass (~> 0.12.7)
2323
foreman (~> 0.61.0)
24-
sass (~> 3.2.5)
25-
susy (~> 1.0.5)
24+
sass (~> 3.2.19)
25+
susy (~> 1.0.9)
26+
27+
BUNDLED WITH
28+
2.1.4

0 commit comments

Comments
 (0)