Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
zack-is-cool committed Oct 5, 2023
1 parent fe7a159 commit 7505f9f
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 178 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include .env
SHELL := /usr/bin/env bash

LOGLEVEL ?= INFO
BRANCH_NAME ?= git-xargs-test
.DEFAULT_GOAL := help

# Optionally add the "-it" flag for docker run commands if the env var "CI" is not set (meaning we are on a local machine and not in github actions)
Expand Down Expand Up @@ -71,7 +72,7 @@ autoformat: ## Update files with automatic formatting tools. Uses Docker for max

.PHONY: push-terraform
push-terraform: ## push changes to terraform repos
bash -x ./scripts/do_all_the_stuff.sh -t terraform -b git-xargs-test -e 'echo "hello"'
./scripts/entrypoint.sh -t terraform -b $(BRANCH_NAME) --no-skip-ci --loglevel $(LOGLEVEL)

.PHONY: debug
debug:
Expand Down
2 changes: 1 addition & 1 deletion repo_templates/terraform/repo_files/.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_HARNESS_REPO=ghcr.io/defenseunicorns/build-harness/build-harness
# renovate: datasource=github-tags depName=defenseunicorns/build-harness
BUILD_HARNESS_VERSION=1.11.1
BUILD_HARNESS_VERSION=1.12.1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: pre-commit

on:
pull_request:
merge_group:


permissions:
Expand All @@ -18,3 +17,5 @@ jobs:
secrets:
APPLICATION_ID: ${{ secrets.NARWHAL_BOT_APP_ID }}
APPLICATION_PRIVATE_KEY: ${{ secrets.NARWHAL_BOT_SECRET }}
with:
check-types: '["common", "terraform", "golang"]'

This file was deleted.

3 changes: 2 additions & 1 deletion repo_templates/terraform/repo_files/.gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
.cache/
.idea/
.DS_Store
.vscode


# Local .terraform directories
.terraform/
*.terraform.*

# .tfstate files
*.tfstate
*.tfstate.*
Expand Down
4 changes: 2 additions & 2 deletions repo_templates/terraform/repo_files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ repos:
- id: go-fmt
- id: golangci-lint
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: v1.83.2
rev: v1.83.4
hooks:
- id: terraform_fmt
- id: terraform_docs
Expand All @@ -40,6 +40,6 @@ repos:
args:
- --args=--config=__GIT_WORKING_DIR__/.tflint.hcl
- repo: https://github.com/renovatebot/pre-commit-hooks
rev: 36.93.7
rev: 36.107.1
hooks:
- id: renovate-config-validator
148 changes: 0 additions & 148 deletions scripts/do_all_the_stuff.sh

This file was deleted.

0 comments on commit 7505f9f

Please sign in to comment.