From 2c8760436e48c6629478908ffbd2f866d4775659 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Mon, 1 Aug 2022 22:09:12 -0400 Subject: [PATCH] Remove a dot file --- .github/workflows/sync-main.yaml | 18 ------------------ .gitignore | 1 - .pre-commit-hooks.yaml | 9 --------- 3 files changed, 28 deletions(-) delete mode 100644 .github/workflows/sync-main.yaml delete mode 100644 .pre-commit-hooks.yaml diff --git a/.github/workflows/sync-main.yaml b/.github/workflows/sync-main.yaml deleted file mode 100644 index 3f052d06..00000000 --- a/.github/workflows/sync-main.yaml +++ /dev/null @@ -1,18 +0,0 @@ -name: Merge main into master - -on: - push: - branches: [main] - -jobs: - sync: - name: Merge main branch - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: {fetch-depth: 0} - - name: merge - run: | - git checkout master - git merge --ff-only main - git push origin master diff --git a/.gitignore b/.gitignore index ce77fdac..a96bf81d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ vendor/ -.dobi/ dist/ junit.xml .plsdo/ diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml deleted file mode 100644 index 0cf49d19..00000000 --- a/.pre-commit-hooks.yaml +++ /dev/null @@ -1,9 +0,0 @@ -- id: gotestsum - name: gotestsum - description: | - `go test` runner with output optimized for humans, JUnit XML for CI - integration, and a summary of the test results. - entry: gotestsum - types: [go] - language: golang - pass_filenames: false