diff --git a/.github/workflows/build-app-beta.yaml b/.github/workflows/build-app-beta.yaml index 9d10bdeda..b238d00c0 100644 --- a/.github/workflows/build-app-beta.yaml +++ b/.github/workflows/build-app-beta.yaml @@ -5,10 +5,10 @@ name: Electron app BETA 'on': push: tags: - - 'v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+' + - v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+ jobs: build: - runs-on: '${{ matrix.os }}' + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: @@ -24,7 +24,7 @@ jobs: echo "PYTHON=/opt/homebrew/bin/python3.11" >> $GITHUB_ENV - name: Context env: - GITHUB_CONTEXT: '${{ toJson(github) }}' + GITHUB_CONTEXT: ${{ toJson(github) }} run: echo "$GITHUB_CONTEXT" - uses: actions/checkout@v2 with: @@ -58,7 +58,7 @@ jobs: yarn printSecrets env: - GIST_UPLOAD_SECRET: '${{secrets.GIST_UPLOAD_SECRET}}' + GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}} - name: fillPackagedPlugins run: | @@ -71,16 +71,16 @@ jobs: yarn run build:app env: - GH_TOKEN: '${{ secrets.GH_TOKEN }}' - WIN_CSC_LINK: '${{ secrets.WINCERT_2025 }}' - WIN_CSC_KEY_PASSWORD: '${{ secrets.WINCERT_2025_PASSWORD }}' - CSC_LINK: '${{ secrets.APPLECERT_CERTIFICATE }}' - CSC_KEY_PASSWORD: '${{ secrets.APPLECERT_PASSWORD }}' - APPLE_ID: '${{ secrets.APPLE_ID }}' - APPLE_TEAM_ID: '${{ secrets.APPLE_TEAM_ID }}' - APPLE_ID_PASSWORD: '${{ secrets.APPLE_ID_PASSWORD }}' - SNAPCRAFT_STORE_CREDENTIALS: '${{secrets.SNAPCRAFT_LOGIN}}' - APPLE_APP_SPECIFIC_PASSWORD: '${{secrets.APPLE_APP_SPECIFIC_PASSWORD}}' + GH_TOKEN: ${{ secrets.GH_TOKEN }} + WIN_CSC_LINK: ${{ secrets.WINCERT_2025 }} + WIN_CSC_KEY_PASSWORD: ${{ secrets.WINCERT_2025_PASSWORD }} + CSC_LINK: ${{ secrets.APPLECERT_CERTIFICATE }} + CSC_KEY_PASSWORD: ${{ secrets.APPLECERT_PASSWORD }} + APPLE_ID: ${{ secrets.APPLE_ID }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} + SNAPCRAFT_STORE_CREDENTIALS: ${{secrets.SNAPCRAFT_LOGIN}} + APPLE_APP_SPECIFIC_PASSWORD: ${{secrets.APPLE_APP_SPECIFIC_PASSWORD}} - name: Copy artifacts run: | mkdir artifacts @@ -111,16 +111,16 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: '${{ matrix.os }}' + name: ${{ matrix.os }} path: artifacts - name: Release uses: softprops/action-gh-release@v1 - if: 'startsWith(github.ref, ''refs/tags/'')' + if: startsWith(github.ref, 'refs/tags/') with: files: artifacts/** prerelease: true env: - GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Print content of notarization-error.log if: failure() && matrix.os == 'macos-14' run: | diff --git a/.github/workflows/build-app-pro-beta.yaml b/.github/workflows/build-app-pro-beta.yaml index d8d1140cc..c42910a0a 100644 --- a/.github/workflows/build-app-pro-beta.yaml +++ b/.github/workflows/build-app-pro-beta.yaml @@ -5,10 +5,10 @@ name: Electron app PREMIUM BETA 'on': push: tags: - - 'v[0-9]+.[0-9]+.[0-9]+-premium-beta.[0-9]+' + - v[0-9]+.[0-9]+.[0-9]+-premium-beta.[0-9]+ jobs: build: - runs-on: '${{ matrix.os }}' + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: @@ -24,7 +24,7 @@ jobs: echo "PYTHON=/opt/homebrew/bin/python3.11" >> $GITHUB_ENV - name: Context env: - GITHUB_CONTEXT: '${{ toJson(github) }}' + GITHUB_CONTEXT: ${{ toJson(github) }} run: echo "$GITHUB_CONTEXT" - uses: actions/checkout@v2 with: @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@v2 with: repository: dbgate/dbgate-pro - token: '${{ secrets.GH_TOKEN }}' + token: ${{ secrets.GH_TOKEN }} path: dbgate-pro ref: ecea1eef17c69c56b0633317e24a68c5220a4810 - name: Merge dbgate/dbgate-pro @@ -88,7 +88,7 @@ jobs: yarn printSecrets env: - GIST_UPLOAD_SECRET: '${{secrets.GIST_UPLOAD_SECRET}}' + GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}} - name: fillPackagedPlugins run: | cd .. @@ -102,16 +102,16 @@ jobs: yarn run build:app env: - GH_TOKEN: '${{ secrets.GH_TOKEN }}' - WIN_CSC_LINK: '${{ secrets.WINCERT_2025 }}' - WIN_CSC_KEY_PASSWORD: '${{ secrets.WINCERT_2025_PASSWORD }}' - CSC_LINK: '${{ secrets.APPLECERT_CERTIFICATE }}' - CSC_KEY_PASSWORD: '${{ secrets.APPLECERT_PASSWORD }}' - APPLE_ID: '${{ secrets.APPLE_ID }}' - APPLE_TEAM_ID: '${{ secrets.APPLE_TEAM_ID }}' - APPLE_ID_PASSWORD: '${{ secrets.APPLE_ID_PASSWORD }}' - SNAPCRAFT_STORE_CREDENTIALS: '${{secrets.SNAPCRAFT_LOGIN}}' - APPLE_APP_SPECIFIC_PASSWORD: '${{secrets.APPLE_APP_SPECIFIC_PASSWORD}}' + GH_TOKEN: ${{ secrets.GH_TOKEN }} + WIN_CSC_LINK: ${{ secrets.WINCERT_2025 }} + WIN_CSC_KEY_PASSWORD: ${{ secrets.WINCERT_2025_PASSWORD }} + CSC_LINK: ${{ secrets.APPLECERT_CERTIFICATE }} + CSC_KEY_PASSWORD: ${{ secrets.APPLECERT_PASSWORD }} + APPLE_ID: ${{ secrets.APPLE_ID }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} + SNAPCRAFT_STORE_CREDENTIALS: ${{secrets.SNAPCRAFT_LOGIN}} + APPLE_APP_SPECIFIC_PASSWORD: ${{secrets.APPLE_APP_SPECIFIC_PASSWORD}} - name: Copy artifacts run: | mkdir artifacts @@ -142,16 +142,16 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: '${{ matrix.os }}' + name: ${{ matrix.os }} path: artifacts - name: Release uses: softprops/action-gh-release@v1 - if: 'startsWith(github.ref, ''refs/tags/'')' + if: startsWith(github.ref, 'refs/tags/') with: files: artifacts/** prerelease: true env: - GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Print content of notarization-error.log if: failure() && matrix.os == 'macos-14' run: | diff --git a/.github/workflows/build-app-pro.yaml b/.github/workflows/build-app-pro.yaml index c8c28e26e..010b49a21 100644 --- a/.github/workflows/build-app-pro.yaml +++ b/.github/workflows/build-app-pro.yaml @@ -5,10 +5,10 @@ name: Electron app PREMIUM 'on': push: tags: - - 'v[0-9]+.[0-9]+.[0-9]+' + - v[0-9]+.[0-9]+.[0-9]+ jobs: build: - runs-on: '${{ matrix.os }}' + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: @@ -24,7 +24,7 @@ jobs: echo "PYTHON=/opt/homebrew/bin/python3.11" >> $GITHUB_ENV - name: Context env: - GITHUB_CONTEXT: '${{ toJson(github) }}' + GITHUB_CONTEXT: ${{ toJson(github) }} run: echo "$GITHUB_CONTEXT" - uses: actions/checkout@v2 with: @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@v2 with: repository: dbgate/dbgate-pro - token: '${{ secrets.GH_TOKEN }}' + token: ${{ secrets.GH_TOKEN }} path: dbgate-pro ref: ecea1eef17c69c56b0633317e24a68c5220a4810 - name: Merge dbgate/dbgate-pro @@ -88,7 +88,7 @@ jobs: yarn printSecrets env: - GIST_UPLOAD_SECRET: '${{secrets.GIST_UPLOAD_SECRET}}' + GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}} - name: fillPackagedPlugins run: | cd .. @@ -102,16 +102,16 @@ jobs: yarn run build:app env: - GH_TOKEN: '${{ secrets.GH_TOKEN }}' - WIN_CSC_LINK: '${{ secrets.WINCERT_2025 }}' - WIN_CSC_KEY_PASSWORD: '${{ secrets.WINCERT_2025_PASSWORD }}' - CSC_LINK: '${{ secrets.APPLECERT_CERTIFICATE }}' - CSC_KEY_PASSWORD: '${{ secrets.APPLECERT_PASSWORD }}' - APPLE_ID: '${{ secrets.APPLE_ID }}' - APPLE_TEAM_ID: '${{ secrets.APPLE_TEAM_ID }}' - APPLE_ID_PASSWORD: '${{ secrets.APPLE_ID_PASSWORD }}' - SNAPCRAFT_STORE_CREDENTIALS: '${{secrets.SNAPCRAFT_LOGIN}}' - APPLE_APP_SPECIFIC_PASSWORD: '${{secrets.APPLE_APP_SPECIFIC_PASSWORD}}' + GH_TOKEN: ${{ secrets.GH_TOKEN }} + WIN_CSC_LINK: ${{ secrets.WINCERT_2025 }} + WIN_CSC_KEY_PASSWORD: ${{ secrets.WINCERT_2025_PASSWORD }} + CSC_LINK: ${{ secrets.APPLECERT_CERTIFICATE }} + CSC_KEY_PASSWORD: ${{ secrets.APPLECERT_PASSWORD }} + APPLE_ID: ${{ secrets.APPLE_ID }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} + SNAPCRAFT_STORE_CREDENTIALS: ${{secrets.SNAPCRAFT_LOGIN}} + APPLE_APP_SPECIFIC_PASSWORD: ${{secrets.APPLE_APP_SPECIFIC_PASSWORD}} - name: Copy artifacts run: | mkdir artifacts @@ -142,16 +142,16 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: '${{ matrix.os }}' + name: ${{ matrix.os }} path: artifacts - name: Release uses: softprops/action-gh-release@v1 - if: 'startsWith(github.ref, ''refs/tags/'')' + if: startsWith(github.ref, 'refs/tags/') with: files: artifacts/** prerelease: false env: - GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Print content of notarization-error.log if: failure() && matrix.os == 'macos-14' run: | diff --git a/.github/workflows/build-app.yaml b/.github/workflows/build-app.yaml index bc4ae305b..db0785eac 100644 --- a/.github/workflows/build-app.yaml +++ b/.github/workflows/build-app.yaml @@ -5,10 +5,10 @@ name: Electron app 'on': push: tags: - - 'v[0-9]+.[0-9]+.[0-9]+' + - v[0-9]+.[0-9]+.[0-9]+ jobs: build: - runs-on: '${{ matrix.os }}' + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: @@ -24,7 +24,7 @@ jobs: echo "PYTHON=/opt/homebrew/bin/python3.11" >> $GITHUB_ENV - name: Context env: - GITHUB_CONTEXT: '${{ toJson(github) }}' + GITHUB_CONTEXT: ${{ toJson(github) }} run: echo "$GITHUB_CONTEXT" - uses: actions/checkout@v2 with: @@ -54,7 +54,7 @@ jobs: yarn printSecrets env: - GIST_UPLOAD_SECRET: '${{secrets.GIST_UPLOAD_SECRET}}' + GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}} - name: fillPackagedPlugins run: | @@ -67,16 +67,16 @@ jobs: yarn run build:app env: - GH_TOKEN: '${{ secrets.GH_TOKEN }}' - WIN_CSC_LINK: '${{ secrets.WINCERT_2025 }}' - WIN_CSC_KEY_PASSWORD: '${{ secrets.WINCERT_2025_PASSWORD }}' - CSC_LINK: '${{ secrets.APPLECERT_CERTIFICATE }}' - CSC_KEY_PASSWORD: '${{ secrets.APPLECERT_PASSWORD }}' - APPLE_ID: '${{ secrets.APPLE_ID }}' - APPLE_TEAM_ID: '${{ secrets.APPLE_TEAM_ID }}' - APPLE_ID_PASSWORD: '${{ secrets.APPLE_ID_PASSWORD }}' - SNAPCRAFT_STORE_CREDENTIALS: '${{secrets.SNAPCRAFT_LOGIN}}' - APPLE_APP_SPECIFIC_PASSWORD: '${{secrets.APPLE_APP_SPECIFIC_PASSWORD}}' + GH_TOKEN: ${{ secrets.GH_TOKEN }} + WIN_CSC_LINK: ${{ secrets.WINCERT_2025 }} + WIN_CSC_KEY_PASSWORD: ${{ secrets.WINCERT_2025_PASSWORD }} + CSC_LINK: ${{ secrets.APPLECERT_CERTIFICATE }} + CSC_KEY_PASSWORD: ${{ secrets.APPLECERT_PASSWORD }} + APPLE_ID: ${{ secrets.APPLE_ID }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} + SNAPCRAFT_STORE_CREDENTIALS: ${{secrets.SNAPCRAFT_LOGIN}} + APPLE_APP_SPECIFIC_PASSWORD: ${{secrets.APPLE_APP_SPECIFIC_PASSWORD}} - name: generatePadFile run: | yarn generatePadFile @@ -114,16 +114,16 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: '${{ matrix.os }}' + name: ${{ matrix.os }} path: artifacts - name: Release uses: softprops/action-gh-release@v1 - if: 'startsWith(github.ref, ''refs/tags/'')' + if: startsWith(github.ref, 'refs/tags/') with: files: artifacts/** prerelease: false env: - GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Print content of notarization-error.log if: failure() && matrix.os == 'macos-14' run: | diff --git a/.github/workflows/build-cloud-pro.yaml b/.github/workflows/build-cloud-pro.yaml index 22b2c1911..b3a3f5e52 100644 --- a/.github/workflows/build-cloud-pro.yaml +++ b/.github/workflows/build-cloud-pro.yaml @@ -5,11 +5,11 @@ name: Cloud images PREMIUM 'on': push: tags: - - 'v[0-9]+.[0-9]+.[0-9]+' - - 'v[0-9]+.[0-9]+.[0-9]+-packer-beta.[0-9]+' + - v[0-9]+.[0-9]+.[0-9]+ + - v[0-9]+.[0-9]+.[0-9]+-packer-beta.[0-9]+ jobs: build: - runs-on: '${{ matrix.os }}' + runs-on: ${{ matrix.os }} strategy: matrix: os: @@ -17,7 +17,7 @@ jobs: steps: - name: Context env: - GITHUB_CONTEXT: '${{ toJson(github) }}' + GITHUB_CONTEXT: ${{ toJson(github) }} run: echo "$GITHUB_CONTEXT" - uses: actions/checkout@v2 with: @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@v2 with: repository: dbgate/dbgate-pro - token: '${{ secrets.GH_TOKEN }}' + token: ${{ secrets.GH_TOKEN }} path: dbgate-pro ref: ecea1eef17c69c56b0633317e24a68c5220a4810 - name: Merge dbgate/dbgate-pro @@ -72,7 +72,7 @@ jobs: cd dbgate-merged yarn printSecrets env: - GIST_UPLOAD_SECRET: '${{secrets.GIST_UPLOAD_SECRET}}' + GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}} - name: Prepare packer build run: | cd .. @@ -87,16 +87,16 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: '${{ matrix.os }}' + name: ${{ matrix.os }} path: artifacts - name: Release uses: softprops/action-gh-release@v1 - if: 'startsWith(github.ref, ''refs/tags/'')' + if: startsWith(github.ref, 'refs/tags/') with: files: artifacts/** prerelease: true env: - GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Run `packer init` for Azure run: | cd ../dbgate-merged/packer @@ -110,33 +110,33 @@ jobs: cd ../dbgate-merged/packer packer init ./aws-ubuntu.pkr.hcl env: - AWS_ACCESS_KEY_ID: '${{secrets.AWS_ACCESS_KEY_ID}}' - AWS_SECRET_ACCESS_KEY: '${{secrets.AWS_SECRET_ACCESS_KEY}}' - AWS_DEFAULT_REGION: '${{secrets.AWS_DEFAULT_REGION}}' + AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}} + AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}} + AWS_DEFAULT_REGION: ${{secrets.AWS_DEFAULT_REGION}} - name: Run `packer build` for AWS run: | cd ../dbgate-merged/packer packer build ./aws-ubuntu.pkr.hcl env: - AWS_ACCESS_KEY_ID: '${{secrets.AWS_ACCESS_KEY_ID}}' - AWS_SECRET_ACCESS_KEY: '${{secrets.AWS_SECRET_ACCESS_KEY}}' - AWS_DEFAULT_REGION: '${{secrets.AWS_DEFAULT_REGION}}' + AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}} + AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}} + AWS_DEFAULT_REGION: ${{secrets.AWS_DEFAULT_REGION}} - name: Delete old Azure VMs run: | cd ../dbgate-merged/packer chmod +x delete-old-azure-images.sh ./delete-old-azure-images.sh env: - AZURE_CLIENT_ID: '${{secrets.AZURE_CLIENT_ID}}' - AZURE_CLIENT_SECRET: '${{secrets.AZURE_CLIENT_SECRET}}' - AZURE_TENANT_ID: '${{secrets.AZURE_TENANT_ID}}' - AZURE_SUBSCRIPTION_ID: '${{secrets.AZURE_SUBSCRIPTION_ID}}' + AZURE_CLIENT_ID: ${{secrets.AZURE_CLIENT_ID}} + AZURE_CLIENT_SECRET: ${{secrets.AZURE_CLIENT_SECRET}} + AZURE_TENANT_ID: ${{secrets.AZURE_TENANT_ID}} + AZURE_SUBSCRIPTION_ID: ${{secrets.AZURE_SUBSCRIPTION_ID}} - name: Delete old AMIs (AWS) run: | cd ../dbgate-merged/packer chmod +x delete-old-amis.sh ./delete-old-amis.sh env: - AWS_ACCESS_KEY_ID: '${{secrets.AWS_ACCESS_KEY_ID}}' - AWS_SECRET_ACCESS_KEY: '${{secrets.AWS_SECRET_ACCESS_KEY}}' - AWS_DEFAULT_REGION: '${{secrets.AWS_DEFAULT_REGION}}' + AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}} + AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}} + AWS_DEFAULT_REGION: ${{secrets.AWS_DEFAULT_REGION}} diff --git a/.github/workflows/build-docker-pro.yaml b/.github/workflows/build-docker-pro.yaml index 3e4579096..48b655590 100644 --- a/.github/workflows/build-docker-pro.yaml +++ b/.github/workflows/build-docker-pro.yaml @@ -5,11 +5,11 @@ name: Docker image PREMIUM 'on': push: tags: - - 'v[0-9]+.[0-9]+.[0-9]+' - - 'v[0-9]+.[0-9]+.[0-9]+-premium-beta.[0-9]+' + - v[0-9]+.[0-9]+.[0-9]+ + - v[0-9]+.[0-9]+.[0-9]+-premium-beta.[0-9]+ jobs: build: - runs-on: '${{ matrix.os }}' + runs-on: ${{ matrix.os }} strategy: matrix: os: @@ -17,7 +17,7 @@ jobs: steps: - name: Context env: - GITHUB_CONTEXT: '${{ toJson(github) }}' + GITHUB_CONTEXT: ${{ toJson(github) }} run: echo "$GITHUB_CONTEXT" - uses: actions/checkout@v2 with: @@ -42,7 +42,7 @@ jobs: uses: actions/checkout@v2 with: repository: dbgate/dbgate-pro - token: '${{ secrets.GH_TOKEN }}' + token: ${{ secrets.GH_TOKEN }} path: dbgate-pro ref: ecea1eef17c69c56b0633317e24a68c5220a4810 - name: Merge dbgate/dbgate-pro @@ -83,7 +83,7 @@ jobs: yarn printSecrets env: - GIST_UPLOAD_SECRET: '${{secrets.GIST_UPLOAD_SECRET}}' + GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}} - name: Prepare docker image run: | cd .. @@ -97,12 +97,12 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v2 with: - username: '${{ secrets.DOCKER_USERNAME }}' - password: '${{ secrets.DOCKER_PASSWORD }}' + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push uses: docker/build-push-action@v3 with: push: true context: ../dbgate-merged/docker - tags: '${{ steps.meta.outputs.tags }}' - platforms: 'linux/amd64,linux/arm64' + tags: ${{ steps.meta.outputs.tags }} + platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index 09c38abdf..644335b1d 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -5,11 +5,11 @@ name: Docker image Community 'on': push: tags: - - 'v[0-9]+.[0-9]+.[0-9]+' - - 'v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+' + - v[0-9]+.[0-9]+.[0-9]+ + - v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+ jobs: build: - runs-on: '${{ matrix.os }}' + runs-on: ${{ matrix.os }} strategy: matrix: os: @@ -17,7 +17,7 @@ jobs: steps: - name: Context env: - GITHUB_CONTEXT: '${{ toJson(github) }}' + GITHUB_CONTEXT: ${{ toJson(github) }} run: echo "$GITHUB_CONTEXT" - uses: actions/checkout@v2 with: @@ -70,7 +70,7 @@ jobs: yarn printSecrets env: - GIST_UPLOAD_SECRET: '${{secrets.GIST_UPLOAD_SECRET}}' + GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}} - name: Prepare docker image run: | @@ -82,20 +82,20 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v2 with: - username: '${{ secrets.DOCKER_USERNAME }}' - password: '${{ secrets.DOCKER_PASSWORD }}' + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push uses: docker/build-push-action@v3 with: push: true context: ./docker - tags: '${{ steps.meta.outputs.tags }}' - platforms: 'linux/amd64,linux/arm64,linux/arm/v7' + tags: ${{ steps.meta.outputs.tags }} + platforms: linux/amd64,linux/arm64,linux/arm/v7 - name: Build and push alpine uses: docker/build-push-action@v3 with: push: true context: ./docker file: ./docker/Dockerfile-alpine - tags: '${{ steps.alpmeta.outputs.tags }}' - platforms: 'linux/amd64,linux/arm64,linux/arm/v7' + tags: ${{ steps.alpmeta.outputs.tags }} + platforms: linux/amd64,linux/arm64,linux/arm/v7 diff --git a/.github/workflows/build-npm-pro.yaml b/.github/workflows/build-npm-pro.yaml index 1e077de7b..3e1ed86d7 100644 --- a/.github/workflows/build-npm-pro.yaml +++ b/.github/workflows/build-npm-pro.yaml @@ -5,11 +5,11 @@ name: NPM packages PREMIUM 'on': push: tags: - - 'v[0-9]+.[0-9]+.[0-9]+' - - 'v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+' + - v[0-9]+.[0-9]+.[0-9]+ + - v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+ jobs: build: - runs-on: '${{ matrix.os }}' + runs-on: ${{ matrix.os }} strategy: matrix: os: @@ -17,7 +17,7 @@ jobs: steps: - name: Context env: - GITHUB_CONTEXT: '${{ toJson(github) }}' + GITHUB_CONTEXT: ${{ toJson(github) }} run: echo "$GITHUB_CONTEXT" - uses: actions/checkout@v2 with: @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@v2 with: repository: dbgate/dbgate-pro - token: '${{ secrets.GH_TOKEN }}' + token: ${{ secrets.GH_TOKEN }} path: dbgate-pro ref: ecea1eef17c69c56b0633317e24a68c5220a4810 - name: Merge dbgate/dbgate-pro @@ -51,7 +51,7 @@ jobs: node adjustNpmPackageJsonPremium - name: Configure NPM token env: - NPM_TOKEN: '${{ secrets.NPM_TOKEN }}' + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} run: | cd .. cd dbgate-merged @@ -77,7 +77,7 @@ jobs: cd dbgate-merged yarn printSecrets env: - GIST_UPLOAD_SECRET: '${{secrets.GIST_UPLOAD_SECRET}}' + GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}} - name: Publish dbgate-api-premium run: | cd .. diff --git a/.github/workflows/build-npm.yaml b/.github/workflows/build-npm.yaml index f204115dd..0c79e5097 100644 --- a/.github/workflows/build-npm.yaml +++ b/.github/workflows/build-npm.yaml @@ -5,11 +5,11 @@ name: NPM packages 'on': push: tags: - - 'v[0-9]+.[0-9]+.[0-9]+' - - 'v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+' + - v[0-9]+.[0-9]+.[0-9]+ + - v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+ jobs: build: - runs-on: '${{ matrix.os }}' + runs-on: ${{ matrix.os }} strategy: matrix: os: @@ -17,7 +17,7 @@ jobs: steps: - name: Context env: - GITHUB_CONTEXT: '${{ toJson(github) }}' + GITHUB_CONTEXT: ${{ toJson(github) }} run: echo "$GITHUB_CONTEXT" - uses: actions/checkout@v2 with: @@ -28,7 +28,7 @@ jobs: node-version: 18.x - name: Configure NPM token env: - NPM_TOKEN: '${{ secrets.NPM_TOKEN }}' + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} run: | npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}" - name: yarn install @@ -41,7 +41,7 @@ jobs: run: | yarn printSecrets env: - GIST_UPLOAD_SECRET: '${{secrets.GIST_UPLOAD_SECRET}}' + GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}} - name: Publish types working-directory: packages/types run: | diff --git a/.github/workflows/build-test-containers.yaml b/.github/workflows/build-test-containers.yaml index af2c5bc81..90346f8f1 100644 --- a/.github/workflows/build-test-containers.yaml +++ b/.github/workflows/build-test-containers.yaml @@ -30,8 +30,8 @@ jobs: uses: docker/login-action@v2 with: registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Push mysql-ssh-login to GHCR run: | docker tag dbgate/mysql-ssh-login:latest ghcr.io/dbgate/mysql-ssh-login:latest diff --git a/.github/workflows/diflow.yaml b/.github/workflows/diflow.yaml index a9b8fbd91..064fd8be8 100644 --- a/.github/workflows/diflow.yaml +++ b/.github/workflows/diflow.yaml @@ -33,4 +33,4 @@ jobs: cd diflow node dist/diflow.js sync -r https://DIFLOW_GIT_SECRET@github.com/dbgate/dbgate-diflow-config.git -b master env: - DIFLOW_GIT_SECRET: '${{ secrets.DIFLOW_GIT_SECRET }}' + DIFLOW_GIT_SECRET: ${{ secrets.DIFLOW_GIT_SECRET }} diff --git a/.github/workflows/e2e-pro.yaml b/.github/workflows/e2e-pro.yaml index ae8dffb02..991a1540f 100644 --- a/.github/workflows/e2e-pro.yaml +++ b/.github/workflows/e2e-pro.yaml @@ -24,7 +24,7 @@ jobs: uses: actions/checkout@v2 with: repository: dbgate/dbgate-pro - token: '${{ secrets.GH_TOKEN }}' + token: ${{ secrets.GH_TOKEN }} path: dbgate-pro ref: ecea1eef17c69c56b0633317e24a68c5220a4810 - name: Merge dbgate/dbgate-pro @@ -70,7 +70,7 @@ jobs: name: screenshots path: screenshots - name: Push E2E screenshots - if: '${{ github.ref_name == ''master'' }}' + if: ${{ github.ref_name == 'master' }} run: | git config --global user.email "info@dbgate.info" git config --global user.name "GitHub Actions" @@ -89,25 +89,25 @@ jobs: ports: - '16000:5432' mysql-cypress: - image: 'mysql:8.0.18' + image: mysql:8.0.18 ports: - '16004:3306' env: MYSQL_ROOT_PASSWORD: Pwd2020Db mysql-ssh-login: - image: 'ghcr.io/dbgate/mysql-ssh-login:latest' + image: ghcr.io/dbgate/mysql-ssh-login:latest ports: - '16012:22' mysql-ssh-keyfile: - image: 'ghcr.io/dbgate/mysql-ssh-keyfile:latest' + image: ghcr.io/dbgate/mysql-ssh-keyfile:latest ports: - '16008:22' dex: - image: 'ghcr.io/dbgate/dex:latest' + image: ghcr.io/dbgate/dex:latest ports: - '16009:5556' mongo: - image: 'mongo:4.0.12' + image: mongo:4.0.12 env: MONGO_INITDB_ROOT_USERNAME: root MONGO_INITDB_ROOT_PASSWORD: Pwd2020Db @@ -126,7 +126,7 @@ jobs: SA_PASSWORD: Pwd2020Db MSSQL_PID: Express oracle: - image: 'gvenzl/oracle-xe:21-slim' + image: gvenzl/oracle-xe:21-slim env: ORACLE_PASSWORD: Pwd2020Db ports: diff --git a/.github/workflows/process-templates.yaml b/.github/workflows/process-templates.yaml index 0e12a4be3..5baa3490e 100644 --- a/.github/workflows/process-templates.yaml +++ b/.github/workflows/process-templates.yaml @@ -15,7 +15,7 @@ jobs: - name: Check out repository uses: actions/checkout@v3 with: - token: '${{ secrets.WORKFLOW_CHANGE_ACCESS_TOKEN }}' + token: ${{ secrets.WORKFLOW_CHANGE_ACCESS_TOKEN }} - name: git pull run: | git pull @@ -47,5 +47,5 @@ jobs: - name: Push changes uses: ad-m/github-push-action@v0.6.0 with: - github_token: '${{ secrets.WORKFLOW_CHANGE_ACCESS_TOKEN }}' + github_token: ${{ secrets.WORKFLOW_CHANGE_ACCESS_TOKEN }} branch: master diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index fa6bbaa1b..3a62c5b8a 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -45,19 +45,19 @@ jobs: - uses: tanmen/jest-reporter@v1 if: always() with: - github-token: '${{ secrets.GITHUB_TOKEN }}' + github-token: ${{ secrets.GITHUB_TOKEN }} result-file: integration-tests/result.json action-name: Integration tests - uses: tanmen/jest-reporter@v1 if: always() with: - github-token: '${{ secrets.GITHUB_TOKEN }}' + github-token: ${{ secrets.GITHUB_TOKEN }} result-file: packages/filterparser/result.json action-name: Filter parser test results - uses: tanmen/jest-reporter@v1 if: always() with: - github-token: '${{ secrets.GITHUB_TOKEN }}' + github-token: ${{ secrets.GITHUB_TOKEN }} result-file: packages/datalib/result.json action-name: Datalib (perspectives) test results services: @@ -69,7 +69,7 @@ jobs: ports: - '15000:5432' mysql-integr: - image: 'mysql:8.0.18' + image: mysql:8.0.18 env: MYSQL_ROOT_PASSWORD: Pwd2020Db ports: @@ -83,27 +83,27 @@ jobs: ports: - '15002:1433' clickhouse-integr: - image: 'bitnami/clickhouse:24.8.4' + image: bitnami/clickhouse:24.8.4 env: CLICKHOUSE_ADMIN_PASSWORD: Pwd2020Db ports: - '15005:8123' oracle-integr: - image: 'gvenzl/oracle-xe:21-slim' + image: gvenzl/oracle-xe:21-slim env: ORACLE_PASSWORD: Pwd2020Db ports: - '15006:1521' cassandradb: - image: 'cassandra:5.0.2' + image: cassandra:5.0.2 ports: - '15942:9042' libsql: - image: 'ghcr.io/tursodatabase/libsql-server:latest' + image: ghcr.io/tursodatabase/libsql-server:latest ports: - '8080:8080' firebird: - image: 'firebirdsql/firebird:latest' + image: firebirdsql/firebird:latest env: FIREBIRD_DATABASE: mydatabase.fdb FIREBIRD_USER: dbuser