Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #412 from es-na-battlesnake/combine-prs-branch
Combined PR
  • Loading branch information
djdefi committed Sep 5, 2023
2 parents 5215252 + 44799ae commit da81724
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-branch.yml
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
# Execute IssueOps branch deployment logic, hooray.
# This will be used to "gate" all future steps below and conditionally trigger steps/deployments
- uses: github/branch-deploy@v7.2.0
- uses: github/branch-deploy@v7.3.1
id: branch-deploy
with:
trigger: ".deploy"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-image.yml
Expand Up @@ -26,7 +26,7 @@ jobs:

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v37.5.1
uses: tj-actions/changed-files@v38.2.0

- name: Build the Docker image
run: docker build . --file Dockerfile --tag ghcr.io/es-na-battlesnake/code-snake:latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/new-pr.yml
Expand Up @@ -18,6 +18,6 @@ jobs:
# Post a comment on newly opened PRs describing the deployment process and related PR steps to deploy
- uses: actions/checkout@v3.0.2
- name: comment
uses: GrantBirki/comment@v2.0.5
uses: GrantBirki/comment@v2.0.6
with:
file: .github/new_pull_request.md
2 changes: 1 addition & 1 deletion .github/workflows/pr-secrets.yml
Expand Up @@ -9,7 +9,7 @@ jobs:
with:
fetch-depth: 0
- name: TruffleHog OSS
uses: trufflesecurity/trufflehog@v3.46.1
uses: trufflesecurity/trufflehog@v3.54.1
with:
path: ./
base: ${{ github.event.repository.default_branch }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/safe-deploy.yml
Expand Up @@ -30,7 +30,7 @@ jobs:

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v37.5.1
uses: tj-actions/changed-files@v38.2.0

- name: Warn if deployment workflow changes
id: safe-deploy
Expand Down
16 changes: 9 additions & 7 deletions Gemfile.lock
Expand Up @@ -7,6 +7,7 @@ GEM
minitest (>= 5.1)
tzinfo (~> 2.0)
ast (2.4.2)
base64 (0.1.1)
concurrent-ruby (1.2.2)
docile (1.4.0)
i18n (1.14.1)
Expand All @@ -24,17 +25,18 @@ GEM
puma (6.3.1)
nio4r (~> 2.0)
racc (1.7.1)
rack (2.2.7)
rack (2.2.8)
rack-contrib (2.3.0)
rack (~> 2.0)
rack-protection (3.0.6)
rack
rack-protection (3.1.0)
rack (~> 2.2, >= 2.2.4)
rack-test (2.1.0)
rack (>= 1.3)
rainbow (3.1.1)
regexp_parser (2.8.1)
rexml (3.2.6)
rubocop (1.55.1)
rubocop (1.56.2)
base64 (~> 0.1.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -55,12 +57,12 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
sinatra (3.0.6)
sinatra (3.1.0)
mustermann (~> 3.0)
rack (~> 2.2, >= 2.2.4)
rack-protection (= 3.0.6)
rack-protection (= 3.1.0)
tilt (~> 2.0)
tilt (2.1.0)
tilt (2.2.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
Expand Down

0 comments on commit da81724

Please sign in to comment.