From 14d4b84930e36da8cca0c725b6669ba32efddcd0 Mon Sep 17 00:00:00 2001 From: Bernd Storath <999999bst@gmail.com> Date: Tue, 22 Apr 2025 12:53:20 +0200 Subject: [PATCH] better formatting --- .github/workflows/deploy-development.yml | 3 +-- .github/workflows/deploy-edge.yml | 3 +-- .github/workflows/deploy.yml | 4 ++-- Dockerfile | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy-development.yml b/.github/workflows/deploy-development.yml index 2d05015e..9e77fc42 100644 --- a/.github/workflows/deploy-development.yml +++ b/.github/workflows/deploy-development.yml @@ -73,8 +73,7 @@ jobs: docker-merge: name: Merge & Deploy Docker runs-on: ubuntu-latest - if: | - github.repository_owner == 'wg-easy' + if: github.repository_owner == 'wg-easy' permissions: packages: write contents: read diff --git a/.github/workflows/deploy-edge.yml b/.github/workflows/deploy-edge.yml index e535798b..d6821af6 100644 --- a/.github/workflows/deploy-edge.yml +++ b/.github/workflows/deploy-edge.yml @@ -84,8 +84,7 @@ jobs: docker-merge: name: Merge & Deploy Docker runs-on: ubuntu-latest - if: | - github.repository_owner == 'wg-easy' + if: github.repository_owner == 'wg-easy' permissions: packages: write contents: read diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a2dc17fb..6d8d510d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -163,8 +163,8 @@ jobs: git fetch origin gh-pages --depth=1 || true # Extract version numbers - DOCS_VERSION=${GITHUB_REF#refs/tags/} # e.g. v1.2.3 or v1.2.3-beta - MINOR_VERSION=$(echo $DOCS_VERSION | cut -d. -f1,2) # e.g. v1.2 + DOCS_VERSION=${GITHUB_REF#refs/tags/} # e.g. v1.2.3 or v1.2.3-beta + MINOR_VERSION=$(echo $DOCS_VERSION | cut -d. -f1,2) # e.g. v1.2 # Check if it's a stable release (only numbers, no '-') if [[ "$DOCS_VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then diff --git a/Dockerfile b/Dockerfile index 0aae23f1..f160d7c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,7 @@ COPY --from=build /app/server/database/migrations /app/server/database/migration # libsql RUN cd /app/server && npm install --no-save libsql # cli -COPY --from=build /app/cli/cli.sh /usr/local/bin/cli +COPY --from=build /app/cli/cli.sh /usr/local/bin/cli RUN chmod +x /usr/local/bin/cli # Install Linux packages