Skip to content

Commit 0d28a0f

Browse files
authoredApr 6, 2024
Merge branch 'master' into pffileobject-secure-coding
2 parents d55b354 + f6355b5 commit 0d28a0f

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed
 

Diff for: ‎.github/workflows/ci.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
tests:
1515
env:
1616
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17-
timeout-minutes: 60
17+
timeout-minutes: 30
1818
strategy:
1919
matrix:
2020
script:
@@ -56,7 +56,7 @@ jobs:
5656
- name: Submodules
5757
run: |
5858
git submodule update --init --recursive
59-
sudo gem install bundler
59+
sudo gem install bundler -v 2.4.22
6060
bundle config set path 'vendor/bundle'
6161
- name: Bundle Install
6262
if: steps.cache-gems.outputs.cache-hit != 'true'
@@ -94,6 +94,7 @@ jobs:
9494
xcode_archive_path: ${{ env.TEST_RESULTS }}
9595
docs:
9696
runs-on: macos-13
97+
timeout-minutes: 15
9798
steps:
9899
- uses: actions/checkout@v3
99100
- name: Setup Ruby
@@ -109,7 +110,7 @@ jobs:
109110
- name: Submodules
110111
run: |
111112
git submodule update --init --recursive
112-
sudo gem install bundler
113+
sudo gem install bundler -v 2.4.22
113114
bundle config path vendor/bundle
114115
- name: Bundle Install
115116
if: steps.cache-gems.outputs.cache-hit != 'true'

Diff for: ‎.github/workflows/release-automated.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Submodules and Bundle Install
3131
run: |
3232
git submodule update --init --recursive
33-
sudo gem install bundler
33+
sudo gem install bundler -v 2.4.22
3434
bundle config set path 'vendor/bundle'
3535
bundle install
3636
- run: npm ci
@@ -64,7 +64,7 @@ jobs:
6464
- name: Submodules
6565
run: |
6666
git submodule update --init --recursive
67-
sudo gem install bundler
67+
sudo gem install bundler -v 2.4.22
6868
bundle config path vendor/bundle
6969
- name: Bundle Install
7070
if: steps.cache-gems.outputs.cache-hit != 'true'

Diff for: ‎.github/workflows/release-manual-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Submodules
3131
run: |
3232
git submodule update --init --recursive
33-
sudo gem install bundler
33+
sudo gem install bundler -v 2.4.22
3434
bundle config path vendor/bundle
3535
- name: Bundle Install
3636
if: steps.cache-gems.outputs.cache-hit != 'true'

Diff for: ‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ For analyzing bugs, creating bug fixes and features we recommend to clone this r
2323
Install all dependencies:
2424
```
2525
git submodule update --init --recursive
26-
gem install bundler
26+
gem install bundler -v 2.4.22
2727
bundle install
2828
```
2929
Run the tests:

0 commit comments

Comments
 (0)