diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 0a3e7cc06..1146eb572 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -1,6 +1,9 @@ name: Dev on: push: + branches: + - '!develop' + - '!feature/update*' jobs: build_docker: name: Build Docker image diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0902fe63b..7947c4154 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,6 +3,7 @@ on: push: branches: - 'develop' + - 'feature/update*' env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} diff --git a/docs-new/.env.example b/bin/docs/.env.example similarity index 100% rename from docs-new/.env.example rename to bin/docs/.env.example diff --git a/bin/docs/.gitignore b/bin/docs/.gitignore new file mode 100644 index 000000000..5ad213baa --- /dev/null +++ b/bin/docs/.gitignore @@ -0,0 +1,2 @@ +output +.env \ No newline at end of file diff --git a/docs-new/index.template.html b/bin/docs/index.template.html similarity index 100% rename from docs-new/index.template.html rename to bin/docs/index.template.html diff --git a/docs-new/prepare.sh b/bin/docs/prepare.sh similarity index 100% rename from docs-new/prepare.sh rename to bin/docs/prepare.sh diff --git a/docs-new/preview.sh b/bin/docs/preview.sh similarity index 100% rename from docs-new/preview.sh rename to bin/docs/preview.sh diff --git a/docs-new/.env b/docs-new/.env deleted file mode 100644 index e1182ce1a..000000000 --- a/docs-new/.env +++ /dev/null @@ -1,4 +0,0 @@ -SHARE_PROTOCOL=https -SHARE_HOST=notes.eliandoran.me -ROOT_NOTE_ID=4yYHqKbLovVX -SHARE_URL=https://notes.eliandoran.me/share/4yYHqKbLovVX \ No newline at end of file diff --git a/docs-new/.gitignore b/docs-new/.gitignore deleted file mode 100644 index 6caf68aff..000000000 --- a/docs-new/.gitignore +++ /dev/null @@ -1 +0,0 @@ -output \ No newline at end of file