Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging #22

Merged
merged 5 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Sync staging branch to main
on:
push:
paths-ignore:
- 'Dockerfile'
branches:
- staging
workflow_dispatch:
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Dockerfile
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# TEST
# TEST 3
FROM golang:buster as app
RUN mkdir -p /yopass
WORKDIR /yopass
Expand Down
2 changes: 1 addition & 1 deletion boo
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Mon Nov 11 14:46:38 GMT 2024
Mon Nov 11 15:05:46 GMT 2024
Loading