Skip to content

Commit 4c659ed

Browse files
authored
Merge pull request rapid7#19644 from adeherdt-r7/MS-9682-rails-upgrade-preparation-workflows
MS-9682 Rails Upgrade Preparation: Workflows
2 parents 67e27c6 + fe4d5af commit 4c659ed

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
# Ensures that the docs site builds successfully. Note that this workflow does not deploy the docs site.
3333
build:
3434
runs-on: ubuntu-latest
35-
timeout-minutes: 40
35+
timeout-minutes: 60
3636

3737
strategy:
3838
fail-fast: true

.github/workflows/ldap_acceptance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ on:
4444
jobs:
4545
ldap:
4646
runs-on: ${{ matrix.os }}
47-
timeout-minutes: 40
47+
timeout-minutes: 60
4848

4949
strategy:
5050
fail-fast: true

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929
jobs:
3030
msftidy:
3131
runs-on: ubuntu-latest
32-
timeout-minutes: 40
32+
timeout-minutes: 60
3333

3434
env:
3535
BUNDLE_WITHOUT: "coverage development pcap"

.github/workflows/mssql_acceptance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ on:
4444
jobs:
4545
mssql:
4646
runs-on: ${{ matrix.os }}
47-
timeout-minutes: 40
47+
timeout-minutes: 60
4848

4949
services:
5050
mssql:

.github/workflows/mysql_acceptance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ on:
4444
jobs:
4545
mysql:
4646
runs-on: ${{ matrix.os }}
47-
timeout-minutes: 40
47+
timeout-minutes: 60
4848

4949
services:
5050
mysql:

.github/workflows/postgres_acceptance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ on:
4444
jobs:
4545
postgres:
4646
runs-on: ${{ matrix.os }}
47-
timeout-minutes: 40
47+
timeout-minutes: 60
4848

4949
services:
5050
postgres:
@@ -54,7 +54,7 @@ jobs:
5454
POSTGRES_USER: postgres
5555
POSTGRES_PASSWORD: password
5656
options: >-
57-
--health-cmd pg_isready
57+
--health-cmd "pg_isready --username postgres"
5858
--health-interval 10s
5959
--health-timeout 5s
6060
--health-retries 5

.github/workflows/shared_smb_acceptance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
jobs:
1818
smb:
1919
runs-on: ${{ matrix.os }}
20-
timeout-minutes: 40
20+
timeout-minutes: 60
2121

2222
strategy:
2323
fail-fast: true

.github/workflows/verify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929
jobs:
3030
build:
3131
runs-on: ubuntu-latest
32-
timeout-minutes: 40
32+
timeout-minutes: 60
3333
name: Docker Build
3434
steps:
3535
- name: Checkout code
@@ -41,7 +41,7 @@ jobs:
4141
4242
test:
4343
runs-on: ${{ matrix.os }}
44-
timeout-minutes: 40
44+
timeout-minutes: 60
4545

4646
services:
4747
postgres:
@@ -51,7 +51,7 @@ jobs:
5151
POSTGRES_USER: postgres
5252
POSTGRES_PASSWORD: postgres
5353
options: >-
54-
--health-cmd pg_isready
54+
--health-cmd "pg_isready --username postgres"
5555
--health-interval 10s
5656
--health-timeout 5s
5757
--health-retries 5

0 commit comments

Comments
 (0)