Skip to content

Commit 236fccd

Browse files
authored
Merge branch 'main' into transfer-project-in-add-npmjs-question
2 parents f7490a5 + 60ea41c commit 236fccd

File tree

4 files changed

+119
-93
lines changed

4 files changed

+119
-93
lines changed

.github/workflows/add_member.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222

2323
steps:
2424
- name: Setup python
25-
uses: actions/setup-python@v5
25+
uses: actions/setup-python@v6
2626
with:
2727
python-version: '3.12'
2828

2929
- name: Checkout code
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131

3232
- name: Get username to add
3333
id: get_username
@@ -70,6 +70,9 @@ jobs:
7070

7171
- name: Check if user wants to become a designer
7272
id: check_designer
73+
continue-on-error: true
74+
env:
75+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7376
run: |
7477
ADD_TO_DESIGNERS=$(gh issue view ${{ env.ISSUE_NUMBER }} --json body | jq -e '.body | contains("[x] Do you wish to join the designers team?")')
7578
if [ "$ADD_TO_DESIGNERS" = "true" ]; then

terraform/production/org.tfvars

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ members = [
3535
"ddabble",
3636
"deronnax",
3737
"devatbosch",
38+
"DhavalGojiya",
3839
"dmpayton",
3940
"dr-rompecabezas",
4041
"elineda",

terraform/production/repositories.tfvars

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ repositories = {
272272
"django-valkey" = {
273273
description = "a Valkey backend for django"
274274
homepage_url = "https://django-valkey.readthedocs.io/en/latest/"
275+
allow_auto_merge = true
275276
allow_merge_commit = true
276277
allow_rebase_merge = true
277278
allow_squash_merge = true

0 commit comments

Comments
 (0)