From 397142d0bfa948dbaf3eb75641ac138a754c1e71 Mon Sep 17 00:00:00 2001 From: Aaron Hine Date: Mon, 11 Nov 2024 14:56:14 +0000 Subject: [PATCH 1/5] update --- Dockerfile | 2 +- boo | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dddbb53..b2e4d37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# TEST +# TEST 2 FROM golang:buster as app RUN mkdir -p /yopass WORKDIR /yopass diff --git a/boo b/boo index 069733c..00f8e8c 100644 --- a/boo +++ b/boo @@ -1 +1 @@ -Mon Nov 11 14:46:38 GMT 2024 +Mon Nov 11 14:56:08 GMT 2024 From fe400ee41aed8fd761f7a2f3557349cee4a2ce19 Mon Sep 17 00:00:00 2001 From: Aaron Hine Date: Mon, 11 Nov 2024 15:00:12 +0000 Subject: [PATCH 2/5] update --- Dockerfile | 2 +- boo | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b2e4d37..d4be178 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# TEST 2 +# TEST 3 FROM golang:buster as app RUN mkdir -p /yopass WORKDIR /yopass diff --git a/boo b/boo index 00f8e8c..83a1e93 100644 --- a/boo +++ b/boo @@ -1 +1 @@ -Mon Nov 11 14:56:08 GMT 2024 +Mon Nov 11 15:00:04 GMT 2024 From 2b499894911e7f07171b1993bee79d23e21c38a2 Mon Sep 17 00:00:00 2001 From: Aaron Hine Date: Mon, 11 Nov 2024 15:03:58 +0000 Subject: [PATCH 3/5] t --- .github/workflows/boo | 1 + .github/workflows/test.yml | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/boo diff --git a/.github/workflows/boo b/.github/workflows/boo new file mode 100644 index 0000000..f2593f5 --- /dev/null +++ b/.github/workflows/boo @@ -0,0 +1 @@ +Mon Nov 11 15:03:52 GMT 2024 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3620044..0f6bc58 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,8 +1,6 @@ name: Sync staging branch to main on: push: - paths-ignore: - - 'Dockerfile' branches: - staging workflow_dispatch: @@ -18,6 +16,10 @@ jobs: run: | git fetch origin staging:staging git reset --hard staging + - name: Remove Dockerfile changes + run: | + git reset HEAD Dockerfile + git checkout -- Dockerfile - name: Create Pull Request uses: peter-evans/create-pull-request@v7 with: From e54bcc314aeaed5c0e61a60cc8ab32652aabc8fd Mon Sep 17 00:00:00 2001 From: Aaron Hine Date: Mon, 11 Nov 2024 15:05:53 +0000 Subject: [PATCH 4/5] tt --- .github/workflows/boo | 1 - boo | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 .github/workflows/boo diff --git a/.github/workflows/boo b/.github/workflows/boo deleted file mode 100644 index f2593f5..0000000 --- a/.github/workflows/boo +++ /dev/null @@ -1 +0,0 @@ -Mon Nov 11 15:03:52 GMT 2024 diff --git a/boo b/boo index 83a1e93..439d551 100644 --- a/boo +++ b/boo @@ -1 +1 @@ -Mon Nov 11 15:00:04 GMT 2024 +Mon Nov 11 15:05:46 GMT 2024 From 57e268933597ddc3c8fdfbd239b9de50cacd33bf Mon Sep 17 00:00:00 2001 From: Aaron Hine Date: Mon, 11 Nov 2024 15:08:58 +0000 Subject: [PATCH 5/5] tt --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9414382 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +Dockerfile