diff --git a/.github/workflows/tag-and-publish.yml b/.github/workflows/publish.yml similarity index 89% rename from .github/workflows/tag-and-publish.yml rename to .github/workflows/publish.yml index e9b66db4..279d3862 100644 --- a/.github/workflows/tag-and-publish.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,4 @@ -name: Tag and publish a new version +name: Publish a new version on: push: @@ -13,10 +13,10 @@ jobs: name: selfhosted steps: - name: Check out the repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: "18" # Specify a Node.js version @@ -146,11 +146,11 @@ jobs: name: publish steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: "18" cache: "npm" @@ -166,6 +166,25 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + - name: Checkout alpha branch + if: github.ref == 'refs/heads/main' + uses: actions/checkout@v2 + with: + ref: alpha + + - name: Merge main into alpha + if: github.ref == 'refs/heads/main' + run: | + git fetch origin main + git merge origin/main + + - name: Push changes + if: github.ref == 'refs/heads/main' + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: alpha + - name: Deploy Docs if: github.ref == 'refs/heads/main' uses: JamesIves/github-pages-deploy-action@v4 diff --git a/.github/workflows/singletenant.yml b/.github/workflows/singletenant.yml index c25fc391..b19becbe 100644 --- a/.github/workflows/singletenant.yml +++ b/.github/workflows/singletenant.yml @@ -9,10 +9,10 @@ jobs: name: selfhosted steps: - name: Check out the repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: "18" # Specify a Node.js version diff --git a/renovate.json b/renovate.json index 5d7d7027..a4892942 100644 --- a/renovate.json +++ b/renovate.json @@ -2,5 +2,8 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "config:recommended" + ], + "baseBranches": [ + "alpha" ] } \ No newline at end of file diff --git a/zeebe-extra/.github/workflows/build-docs.yml b/zeebe-extra/.github/workflows/build-docs.yml index caccb8ae..a9a69833 100644 --- a/zeebe-extra/.github/workflows/build-docs.yml +++ b/zeebe-extra/.github/workflows/build-docs.yml @@ -34,11 +34,11 @@ jobs: - 26500:26500 steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 16.17.0 cache: "npm"