Skip to content

Commit

Permalink
Merge branch 'main' into renovate/actions-stale-9.x
Browse files Browse the repository at this point in the history
  • Loading branch information
glasnt authored Jan 11, 2024
2 parents 1857f33 + c1103c2 commit e534190
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 14 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'
stale-pr-message: 'This PR is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'
exempt-issue-labels: triaged,dependencies
exempt-issue-labels: 'triaged'
exempt-pr-labels: 'dependencies,autorelease: pending'
2 changes: 1 addition & 1 deletion build/int.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ tags:
- 'integration'
substitutions:
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'
2 changes: 1 addition & 1 deletion infra/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# Make will use bash instead of sh
SHELL := /usr/bin/env bash

DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.12
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.18
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
REGISTRY_URL := gcr.io/cloud-foundation-cicd
ENABLE_BPMETADATA := 1
Expand Down
11 changes: 0 additions & 11 deletions renovate.json

This file was deleted.

0 comments on commit e534190

Please sign in to comment.