Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .expeditor/run_linux_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ set -ue
export USER="root"
export LANG=C.UTF-8 LANGUAGE=C.UTF-8

echo "--- Removing Gemfile.lock to generate fresh lock file"
rm -f Gemfile.lock

echo "--- bundle install"

bundle config --local path vendor/bundle
Expand Down
3 changes: 3 additions & 0 deletions .expeditor/run_windows_tests.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
$ErrorActionPreference="stop"

Write-Host "--- Removing Gemfile.lock to generate fresh lock file"
Remove-Item -Path "Gemfile.lock" -Force -ErrorAction SilentlyContinue

Write-Host "--- bundle install"

bundle config --local path vendor/bundle
Expand Down
2 changes: 1 addition & 1 deletion .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ expeditor:
retry:
automatic:
limit: 1
timeout_in_minutes: 30
timeout_in_minutes: 60

steps:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-main-pull-request-stub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ name: CI Pull Request on Main Branch

on:
pull_request:
branches: [ main, release/** ]
branches: [ nikhil/checking-scan-with-lock-file, release/** ]
push:
branches: [ main, release/** ]
branches: [ nikhil/checking-scan-with-lock-file, release/** ]

workflow_dispatch:

Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ Vagrantfile
# some acceptance tests will leave this if they fail
my-cookbook
results/
Gemfile.lock


.idea/
Loading
Loading