From eb055119951c3c696843020a2f55f948e06f157c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Simi=C4=87?= Date: Wed, 3 Apr 2024 01:06:06 +0200 Subject: [PATCH] revert: "feat: Refactor workflows to use implicit calling" This reverts commit 8335098d91d69eceebdcd6018733c6483be68512. --- .github/dependabot.yml | 12 ++++++++++++ .github/workflows/build.yml | 18 ++++++++---------- .github/workflows/tests.yml | 4 ++-- 3 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..f33a02cd1 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for more information: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates +# https://containers.dev/guide/dependabot + +version: 2 +updates: + - package-ecosystem: "devcontainers" + directory: "/" + schedule: + interval: weekly diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6b2dbf73a..90b8590f4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,14 +1,14 @@ name: Build and publish - on: - workflow_run: - workflows: [Tests] - types: completed - + push: + tags: + - '*' jobs: + tests: + uses: ./.github/workflows/tests.yml build: + needs: [tests] runs-on: ${{ matrix.os }} - if: github.event.workflow_run.conclusion == 'success' && github.ref_type == 'tag' && startsWith(github.ref_name, 'v') strategy: matrix: os: @@ -18,16 +18,14 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v3 with: - node-version: 20 + node-version: 16 cache: 'npm' - name: Install Snapcraft - # TODO: Bump after we're sure it works with samuelmeuli/action-electron-builder@v1 uses: samuelmeuli/action-snapcraft@v1 if: startsWith(matrix.os, 'ubuntu') - name: Build & publish Caprine - # TODO: Upgrade action in fork https://github.com/dusansimic/action-electron-builder uses: samuelmeuli/action-electron-builder@v1 with: github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e62d7c094..01817676b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -66,9 +66,9 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v3 with: - node-version: 20 + node-version: 16 cache: 'npm' - name: Run tests run: |