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: diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9414382 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +Dockerfile diff --git a/Dockerfile b/Dockerfile index dddbb53..d4be178 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# TEST +# TEST 3 FROM golang:buster as app RUN mkdir -p /yopass WORKDIR /yopass diff --git a/boo b/boo index 069733c..439d551 100644 --- a/boo +++ b/boo @@ -1 +1 @@ -Mon Nov 11 14:46:38 GMT 2024 +Mon Nov 11 15:05:46 GMT 2024