Skip to content

Commit b366100

Browse files
Merge remote-tracking branch 'origin/main' into composer-prompt
* origin/main: (32 commits) add shadow filter to post feeds (#9406) Nightly source-language update [AAv2] Fix for mod screen (#9483) Nightly source-language update Age Assurance V2 (#9479) Merge pull request #9475 from bluesky-social/jc/cache Nightly source-language update Catch crop cancelled errors (#9451) Nightly source-language update add dot separated time style (#9455) Nightly source-language update [APP-1403] Profile empty states (#8969) Nightly source-language update use contentFit prop (#9452) update golang to v1.25 (and some containers do debian bookworm) (#9442) Nightly source-language update Use new blue everywhere (#9435) Split React Native patches into individual patches (#9429) Reading the optional String extras from attachment share intents (#9396) bump version to v1.111 (#9431) ...
2 parents 9d8d94f + 55eb6c5 commit b366100

File tree

238 files changed

+10841
-8008
lines changed

Some content is hidden

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

238 files changed

+10841
-8008
lines changed

.env.example

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,3 @@ EXPO_PUBLIC_BITDRIFT_API_KEY=
3636

3737
# bapp-config web worker URL
3838
BAPP_CONFIG_DEV_URL=
39-
40-
# Dev-only passthrough value for bapp-config web worker
41-
BAPP_CONFIG_DEV_BYPASS_SECRET=

.github/workflows/build-and-push-bskyweb-aws.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Checkout repository
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626

2727
- name: Setup Docker buildx
2828
uses: docker/setup-buildx-action@v1

.github/workflows/build-and-push-bskyweb-ghcr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727

2828
- name: Setup Docker buildx
2929
uses: docker/setup-buildx-action@v1

.github/workflows/build-and-push-embedr-aws.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Checkout repository
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626

2727
- name: Setup Docker buildx
2828
uses: docker/setup-buildx-action@v1

.github/workflows/build-and-push-link-aws.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ on:
33
workflow_dispatch:
44
pull_request:
55
paths:
6-
- 'bskylink/**'
7-
- 'Dockerfile.bskylink'
8-
- '.github/workflows/build-and-push-link-aws.yaml'
6+
- "bskylink/**"
7+
- "Dockerfile.bskylink"
8+
- ".github/workflows/build-and-push-link-aws.yaml"
99

1010
env:
1111
REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout repository
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828

2929
- name: Setup Docker buildx
3030
uses: docker/setup-buildx-action@v1

.github/workflows/build-and-push-ogcard-aws.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ on:
33
workflow_dispatch:
44
pull_request:
55
paths:
6-
- 'bskyogcard/**'
7-
- 'Dockerfile.bskyogcard'
8-
- '.github/workflows/build-and-push-ogcard-aws.yaml'
6+
- "bskyogcard/**"
7+
- "Dockerfile.bskyogcard"
8+
- ".github/workflows/build-and-push-ogcard-aws.yaml"
99

1010
env:
1111
REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout repository
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828

2929
- name: Setup Docker buildx
3030
uses: docker/setup-buildx-action@v1

.github/workflows/build-submit-android.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
fetch-depth: 5
3131

3232
- name: 🔧 Setup Node
33-
uses: actions/setup-node@v4
33+
uses: actions/setup-node@v6
3434
with:
3535
node-version-file: .nvmrc
3636
cache: yarn
@@ -39,7 +39,7 @@ jobs:
3939
uses: dcarbone/install-jq-action@v2
4040

4141
- name: 🔨 Setup EAS
42-
uses: expo/expo-github-action@v8
42+
uses: expo/expo-github-action@main
4343
with:
4444
expo-version: latest
4545
eas-version: latest
@@ -54,7 +54,7 @@ jobs:
5454
java-version: "17"
5555

5656
- name: ⚙️ Install dependencies
57-
run: yarn install
57+
run: yarn install --frozen-lockfile
5858

5959
- name: 🔤 Compile translations
6060
run: yarn intl:build 2>&1 | tee i18n.log

.github/workflows/build-submit-ios.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
build:
1616
if: github.repository == 'bluesky-social/social-app'
1717
name: Build and Submit iOS
18-
runs-on: macos-26
18+
runs-on: macos-26-xlarge
1919
steps:
2020
- name: Check for EXPO_TOKEN
2121
run: >
@@ -30,7 +30,7 @@ jobs:
3030
fetch-depth: 5
3131

3232
- name: 🔧 Setup Node
33-
uses: actions/setup-node@v4
33+
uses: actions/setup-node@v6
3434
with:
3535
node-version-file: .nvmrc
3636
cache: yarn
@@ -39,7 +39,7 @@ jobs:
3939
uses: dcarbone/install-jq-action@v2
4040

4141
- name: 🔨 Setup EAS
42-
uses: expo/expo-github-action@v8
42+
uses: expo/expo-github-action@main
4343
with:
4444
expo-version: latest
4545
eas-version: latest
@@ -49,7 +49,7 @@ jobs:
4949
run: yarn global add eas-cli-local-build-plugin
5050

5151
- name: ⚙️ Install dependencies
52-
run: yarn install
52+
run: yarn install --frozen-lockfile
5353

5454
- uses: maxim-lobanov/setup-xcode@v1
5555
with:
@@ -61,7 +61,7 @@ jobs:
6161
version: 1.16.2
6262

6363
- name: 💾 Cache Pods
64-
uses: actions/cache@v3
64+
uses: actions/cache@v4
6565
id: pods-cache
6666
with:
6767
path: ./ios/Pods

.github/workflows/bundle-deploy-eas-update.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
run: git fetch origin main:main --depth 100
5656

5757
- name: 🔧 Setup Node
58-
uses: actions/setup-node@v4
58+
uses: actions/setup-node@v6
5959
with:
6060
node-version-file: .nvmrc
6161
cache: yarn
@@ -86,7 +86,7 @@ jobs:
8686
run: yarn typecheck
8787

8888
- name: 🔨 Setup EAS
89-
uses: expo/expo-github-action@v8
89+
uses: expo/expo-github-action@main
9090
if: ${{ !steps.fingerprint.outputs.includes-changes }}
9191
with:
9292
expo-version: latest
@@ -172,13 +172,13 @@ jobs:
172172
fetch-depth: 5
173173

174174
- name: 🔧 Setup Node
175-
uses: actions/setup-node@v4
175+
uses: actions/setup-node@v6
176176
with:
177177
node-version-file: .nvmrc
178178
cache: yarn
179179

180180
- name: 🔨 Setup EAS
181-
uses: expo/expo-github-action@v8
181+
uses: expo/expo-github-action@main
182182
with:
183183
expo-version: latest
184184
eas-version: latest
@@ -188,7 +188,7 @@ jobs:
188188
run: yarn global add eas-cli-local-build-plugin
189189

190190
- name: ⚙️ Install dependencies
191-
run: yarn install
191+
run: yarn install --frozen-lockfile
192192

193193
- uses: maxim-lobanov/setup-xcode@v1
194194
with:
@@ -200,7 +200,7 @@ jobs:
200200
version: 1.16.2
201201

202202
- name: 💾 Cache Pods
203-
uses: actions/cache@v3
203+
uses: actions/cache@v4
204204
id: pods-cache
205205
with:
206206
path: ./ios/Pods
@@ -276,13 +276,13 @@ jobs:
276276
fetch-depth: 5
277277

278278
- name: 🔧 Setup Node
279-
uses: actions/setup-node@v4
279+
uses: actions/setup-node@v6
280280
with:
281281
node-version-file: .nvmrc
282282
cache: yarn
283283

284284
- name: 🔨 Setup EAS
285-
uses: expo/expo-github-action@v8
285+
uses: expo/expo-github-action@main
286286
with:
287287
expo-version: latest
288288
eas-version: latest
@@ -297,7 +297,7 @@ jobs:
297297
java-version: "17"
298298

299299
- name: ⚙️ Install dependencies
300-
run: yarn install
300+
run: yarn install --frozen-lockfile
301301

302302
- name: 🔤 Compile translations
303303
run: yarn intl:build

.github/workflows/golang-test-lint.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ on:
77
- main
88

99
concurrency:
10-
group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
10+
group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
1111
cancel-in-progress: true
1212

1313
jobs:
1414
build-and-test:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Git Checkout
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
- name: Set up Go tooling
2020
uses: actions/setup-go@v3
2121
with:
22-
go-version: '1.23'
22+
go-version: "1.25"
2323
- name: Dummy Static Files
2424
run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
2525
- name: Check
@@ -32,11 +32,11 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Git Checkout
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636
- name: Set up Go tooling
3737
uses: actions/setup-go@v3
3838
with:
39-
go-version: '1.23'
39+
go-version: "1.25"
4040
- name: Dummy Static Files
4141
run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
4242
- name: Lint

0 commit comments

Comments
 (0)