Skip to content
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
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.0
0.6.1
15 changes: 13 additions & 2 deletions tests/test_nightly_release_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,19 @@ def test_nightly_runs_full_package_and_publication_path(self) -> None:
self.assertIn("gh release create nightly", content)
self.assertIn("nextcloud-libraries/nextcloud-appstore-push-action@", content)
self.assertIn("nightly: true", content)
self.assertIn("printf 'Automated nightly build from `%s`.", content)
self.assertIn("printf 'Generated from commit `%s`.", content)
self.assertIn("printf 'Automated nightly build from `%s`.\\\\n'", content)
self.assertIn("printf 'Generated from commit `%s`.\\\\n'", content)
self.assertNotIn("from `%s`.\\\\\\\\n", content)

def test_server_is_available_before_makefile_packaging(self) -> None:
content = TEMPLATE.read_text(encoding="utf-8")

server = content.index("- name: Resolve Nextcloud server download")
package = content.index("- name: Package with Makefile")
sign = content.index("- name: Sign app")

self.assertLess(server, package)
self.assertLess(package, sign)

def test_checkout_credentials_are_not_persisted(self) -> None:
content = TEMPLATE.read_text(encoding="utf-8")
Expand Down
32 changes: 16 additions & 16 deletions workflow-templates/nightly-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,22 +160,6 @@ jobs:
cd "${APP_NAME}"
krankerl package

- name: Package with Makefile
if: steps.krankerl.outputs.files_exists != 'true'
shell: bash
run: |
cd "${APP_NAME}"
make appstore

- name: Verify app store package
if: steps.krankerl.outputs.files_exists != 'true'
working-directory: ${{ env.APP_NAME }}
shell: bash
run: |
if make -qp 2>/dev/null | grep -q '^verify-appstore-package:'; then
make verify-appstore-package
fi

- name: Resolve Nextcloud server download
id: server-download
continue-on-error: true
Expand All @@ -197,6 +181,22 @@ jobs:
repository: nextcloud/server
path: nextcloud

- name: Package with Makefile
if: steps.krankerl.outputs.files_exists != 'true'
shell: bash
run: |
cd "${APP_NAME}"
make appstore

- name: Verify app store package
if: steps.krankerl.outputs.files_exists != 'true'
working-directory: ${{ env.APP_NAME }}
shell: bash
run: |
if make -qp 2>/dev/null | grep -q '^verify-appstore-package:'; then
make verify-appstore-package
fi

- name: Sign app
shell: bash
env:
Expand Down
Loading