Merge branch 'feature/update_to_node20' into feature/update_electron

2025-11-04 05:28:59 +01:00 · 2024-07-20 16:39:38 +03:00 · 2024-07-20 16:39:38 +03:00 · e778680e94
commit e778680e94
parent 45a751ac6c 9b9180e5c8
9 changed files with 6 additions and 5 deletions
--- 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
--- 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 }}
--- a/bin/docs/.env.example
+++ b/bin/docs/.env.example
--- a/bin/docs/.gitignore
+++ b/bin/docs/.gitignore
@ -0,0 +1,2 @@
+output
+.env
--- a/bin/docs/index.template.html
+++ b/bin/docs/index.template.html
--- a/bin/docs/prepare.sh
+++ b/bin/docs/prepare.sh
--- a/bin/docs/preview.sh
+++ b/bin/docs/preview.sh
--- a/docs-new/.env
+++ b/docs-new/.env
@ -1,4 +0,0 @@
-SHARE_PROTOCOL=https
-SHARE_HOST=notes.eliandoran.me
-ROOT_NOTE_ID=4yYHqKbLovVX
-SHARE_URL=https://notes.eliandoran.me/share/4yYHqKbLovVX
--- a/docs-new/.gitignore
+++ b/docs-new/.gitignore
@ -1 +0,0 @@
-output