From abe25a121a39c6a31b639bc093031ca76db250e0 Mon Sep 17 00:00:00 2001
From: Jake Wharton <jw@jakewharton.com>
Date: Tue, 28 Jul 2026 12:43:08 -0400
Subject: [PATCH] Update GitHub Actions for new secrets and branch

---
 .github/workflows/build.yml      | 14 ++++++--------
 .github/workflows/containers.yml |  4 ++--
 .github/workflows/docs.yml       |  4 ++--
 .github/workflows/publish.yml    |  1 -
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ccf0f6629714..f7e218be5c3c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: build
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     types: [opened, labeled, unlabeled, synchronize]
 
@@ -20,7 +20,7 @@ concurrency:
 jobs:
   publish:
     runs-on: ubuntu-latest
-    if: github.repository == 'square/okhttp' && github.ref == 'refs/heads/master'
+    if: github.repository == 'square/okhttp' && github.ref == 'refs/heads/main'
 
     steps:
       - name: Checkout
@@ -41,7 +41,6 @@ jobs:
           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_CENTRAL_USERNAME }}
           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }}
           ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_SECRET_KEY }}
-          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_SECRET_PASSPHRASE }}
 
   validation:
     name: "Validation"
@@ -116,7 +115,7 @@ jobs:
         run: ./gradlew test allTests -Ptest.java.version=${{ matrix.java-version }}
 
       - name: Publish Test Report
-        if: github.repository == 'square/okhttp' && github.ref == 'refs/heads/master' && matrix.java-version == '11'
+        if: github.repository == 'square/okhttp' && github.ref == 'refs/heads/main' && matrix.java-version == '11'
         uses: mikepenz/action-junit-report@v6
         with:
           report_paths: '**/build/test-results/*/TEST-*.xml'
@@ -124,14 +123,14 @@ jobs:
 
       - name: Publish Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2
-        if: github.repository == 'square/okhttp' && github.ref == 'refs/heads/master' && matrix.java-version == '11'
+        if: github.repository == 'square/okhttp' && github.ref == 'refs/heads/main' && matrix.java-version == '11'
         with:
           files: |
             **/build/test-results/*/TEST-*.xml
 
   openjdk8alpn:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'jdkversions')
+    if: github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'jdkversions')
 
     steps:
       - name: Checkout
@@ -157,7 +156,7 @@ jobs:
 
   providers:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'providers')
+    if: github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'providers')
     strategy:
       matrix:
         include:
@@ -493,4 +492,3 @@ jobs:
 
       - name: Run with Jlink
         run: ./gradlew module-tests:imageRun -PokhttpModuleTests=true
-
diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
index e6ae4ba5159f..9e1acc6c981e 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -3,7 +3,7 @@ name: containers
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     types: [opened, labeled, unlabeled, synchronize]
 
@@ -18,7 +18,7 @@ jobs:
     permissions:
       checks: write # for actions/upload-artifact
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'containers')
+    if: github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'containers')
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 703109b77a8d..92a9b6ec6d9e 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -3,7 +3,7 @@ name: docs
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     types: [opened, labeled, unlabeled, synchronize]
 
@@ -18,7 +18,7 @@ jobs:
     permissions:
       checks: write # for actions/upload-artifact
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'documentation')
+    if: github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'documentation')
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 73f69462287b..592a36388529 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -27,4 +27,3 @@ jobs:
           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_CENTRAL_USERNAME }}
           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }}
           ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_SECRET_KEY }}
-          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_SECRET_PASSPHRASE }}