Skip to content

Preparing the auto merging combined with the deployment of new versions #812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/actions/deploy/create-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:[email protected]/nextcloud/cookbook.git"

git push tokenized $stable_branch
git push tokenized $master_branch
git push origin "v$version"

echo "::set-output name=version::$version"
7 changes: 6 additions & 1 deletion .github/workflows/deploy-appstore.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

name: Deploy testing
name: Deploy to Appstore

on:
push:
Expand All @@ -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
Expand All @@ -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

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ name: CI

on:
push:
paths-ignore:
- 'docs/**'
- 'l10n/**'
pull_request:

jobs:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down