Merge branch 'master' into master

parse-community · Apr 6, 2024 · 492bba7 · 492bba7
2 parents 85a7ce4 + f6355b5
commit 492bba7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
   tests:
     env:
       GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    timeout-minutes: 60
+    timeout-minutes: 30
     strategy:
       matrix:
         script:
@@ -56,7 +56,7 @@ jobs:
       - name: Submodules
         run: |
           git submodule update --init --recursive
-          sudo gem install bundler
+          sudo gem install bundler -v 2.4.22
           bundle config set path 'vendor/bundle'
       - name: Bundle Install
         if: steps.cache-gems.outputs.cache-hit != 'true'
@@ -94,6 +94,7 @@ jobs:
           xcode_archive_path: ${{ env.TEST_RESULTS }}
   docs:
     runs-on: macos-13
+    timeout-minutes: 15
     steps:
       - uses: actions/checkout@v3
       - name: Setup Ruby
@@ -109,7 +110,7 @@ jobs:
       - name: Submodules
         run: |
           git submodule update --init --recursive
-          sudo gem install bundler
+          sudo gem install bundler -v 2.4.22
           bundle config path vendor/bundle
       - name: Bundle Install
         if: steps.cache-gems.outputs.cache-hit != 'true'

diff --git a/.github/workflows/release-automated.yml b/.github/workflows/release-automated.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Submodules and Bundle Install
         run: |
           git submodule update --init --recursive
-          sudo gem install bundler
+          sudo gem install bundler -v 2.4.22
           bundle config set path 'vendor/bundle'
           bundle install
       - run: npm ci
@@ -64,7 +64,7 @@ jobs:
       - name: Submodules
         run: |
           git submodule update --init --recursive
-          sudo gem install bundler
+          sudo gem install bundler -v 2.4.22
           bundle config path vendor/bundle
       - name: Bundle Install
         if: steps.cache-gems.outputs.cache-hit != 'true'

diff --git a/.github/workflows/release-manual-docs.yml b/.github/workflows/release-manual-docs.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Submodules
         run: |
           git submodule update --init --recursive
-          sudo gem install bundler
+          sudo gem install bundler -v 2.4.22
           bundle config path vendor/bundle
       - name: Bundle Install
         if: steps.cache-gems.outputs.cache-hit != 'true'

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -23,7 +23,7 @@ For analyzing bugs, creating bug fixes and features we recommend to clone this r
    Install all dependencies:
    ```
    git submodule update --init --recursive
-   gem install bundler
+   gem install bundler -v 2.4.22
    bundle install
    ```
    Run the tests: