diff --git a/.github/actions/deploy/create-version.sh b/.github/actions/deploy/create-version.sh index 305e50609..f4993fe52 100755 --- a/.github/actions/deploy/create-version.sh +++ b/.github/actions/deploy/create-version.sh @@ -57,8 +57,10 @@ git tag "v$version" git checkout $master_branch git merge --no-ff $stable_branch -git push origin $stable_branch -git push origin $master_branch +git remote add tokenized "https://nextcloud-cookbook-bot:$BOT_TOKEN@github.com/nextcloud/cookbook.git" + +git push tokenized $stable_branch +git push tokenized $master_branch git push origin "v$version" echo "::set-output name=version::$version" diff --git a/.github/workflows/deploy-appstore.yml b/.github/workflows/deploy-appstore.yml index 30341af66..969766cdc 100644 --- a/.github/workflows/deploy-appstore.yml +++ b/.github/workflows/deploy-appstore.yml @@ -1,5 +1,5 @@ -name: Deploy testing +name: Deploy to Appstore on: push: @@ -17,6 +17,8 @@ jobs: shell: bash working-directory: cookbook + if: github.actor != 'nextcloud-cookbook-bot' + steps: - name: Checkout the project uses: actions/checkout@v2 @@ -28,9 +30,12 @@ jobs: - name: Bump the version id: bump run: ./.github/actions/deploy/create-version.sh + env: + BOT_TOKEN: ${{ secrets.COOKBOOK_BOT_TOKEN }} - name: Install the NPM packages run: npm install + - name: Build NPM run: npm run build diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a74262479..ed57a972a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,6 +3,9 @@ name: CI on: push: + paths-ignore: + - 'docs/**' + - 'l10n/**' pull_request: jobs: diff --git a/CHANGELOG.md b/CHANGELOG.md index a612d64b5..cc442074e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ [#811](https://github.com/nextcloud/cookbook/pull/811) @christianlupus - Updated codecov parser to binary version (fix #810) [#813](https://github.com/nextcloud/cookbook/pull/813) @christianlupus +- Allow bot user to push to stable branch + [#812](https://github.com/nextcloud/cookbook/pull/812) @christianlupus ## 0.9.4 - 2021-09-29