Merge pull request #3250 from LibreSign/fix/sign-setup-when-build

fix: sign setup when build
LibreSign · Jul 1, 2024 · 828a83f · 828a83f
2 parents e951791 + dec3e86
commit 828a83f
Show file tree

Hide file tree

Showing 21 changed files with 60 additions and 638 deletions.
diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml
@@ -69,7 +69,6 @@ jobs:
         php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
         server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
         mariadb-versions: ['10.6', '10.11']
-        testsuite: [unit, api]
 
     name: MariaDB ${{ matrix.mariadb-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
 
@@ -161,7 +160,7 @@ jobs:
         # Only run if phpunit config file exists
         if: steps.check_phpunit.outcome == 'success'
         working-directory: apps/${{ env.APP_NAME }}
-        run: php vendor/bin/phpunit --colors=always --testsuite=${{ matrix.testsuite }}
+        run: composer run test:unit
 
       - name: Check PHPUnit integration script is defined
         id: check_integration

diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
@@ -69,9 +69,8 @@ jobs:
         php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
         server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
         mysql-versions: ["8.4"]
-        testsuite: [unit, api]
 
-    name: MySQL ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} Testsuite ${{ matrix.testsuite }}
+    name: MySQL ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
 
     services:
       mysql:
@@ -161,7 +160,7 @@ jobs:
         # Only run if phpunit config file exists
         if: steps.check_phpunit.outcome == 'success'
         working-directory: apps/${{ env.APP_NAME }}
-        run: php vendor/bin/phpunit --colors=always --testsuite=${{ matrix.testsuite }}
+        run: composer run test:unit
 
       - name: Check PHPUnit integration script is defined
         id: check_integration

diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
@@ -68,7 +68,6 @@ jobs:
       matrix:
         php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
         server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
-        testsuite: [unit, api]
 
     name: PostgreSQL PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
 
@@ -157,7 +156,7 @@ jobs:
         # Only run if phpunit config file exists
         if: steps.check_phpunit.outcome == 'success'
         working-directory: apps/${{ env.APP_NAME }}
-        run: php vendor/bin/phpunit --colors=always --testsuite=${{ matrix.testsuite }}
+        run: composer run test:unit
 
       - name: Check PHPUnit integration script is defined
         id: check_integration

diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
@@ -68,10 +68,9 @@ jobs:
       matrix:
         php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
         server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
-        testsuite: [unit, api]
         xdebug_mode: [debug, coverage]
 
-    name: SQLite PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} Testsuite ${{ matrix.testsuite }}
+    name: SQLite PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
 
     steps:
       - name: Set app env
@@ -149,7 +148,7 @@ jobs:
         working-directory: apps/${{ env.APP_NAME }}
         env:
           XDEBUG_MODE: ${{ matrix.xdebug_mode }}
-        run: php vendor/bin/phpunit --colors=always --testsuite=${{ matrix.testsuite }}
+        run: composer run test:unit
 
       - name: Check PHPUnit integration script is defined
         id: check_integration

diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ node_modules/
 .phpunit.result.cache
 *.phar
 /src/__test__/coverage
+/appinfo/install-*.json
diff --git a/Makefile b/Makefile
@@ -16,11 +16,6 @@ appstore_sign_dir=$(appstore_build_directory)/sign
 cert_dir=$(build_tools_directory)/certificates
 npm=$(shell which npm 2> /dev/null)
 composer=$(shell which composer 2> /dev/null)
-ifeq (,$(shell type occ))
-	occ="php ../../occ"
-else
-	occ="occ"
-endif
 
 all: dev-setup build-js-production
 serve: dev-setup watch-js
@@ -109,22 +104,24 @@ appstore:
 	mkdir -p $(appstore_sign_dir)/$(app_name)/tests/fixtures
 	cp tests/fixtures/small_valid.pdf $(appstore_sign_dir)/$(app_name)/tests/fixtures
 
-	@if [ -z "$$GITHUB_ACTION" ]; then \
-		chown -R www-data:www-data $(appstore_sign_dir)/$(app_name) ; \
-	fi
-
 	mkdir -p $(cert_dir)
-	@if [ ! -f $(cert_dir)/$(app_name).crt ]; then \
-		curl -o $(cert_dir)/$(app_name).crt \
-			"https://github.com/nextcloud/app-certificate-requests/raw/master/$(app_name)/$(app_name).crt"; \
+	@if [ -n "$$GITHUB_ACTION" ]; then \
+		echo '${{ secrets.APP_PRIVATE_KEY }}' > $(cert_dir)/$(app_name).key ; \
 	fi
 	@if [ -f $(cert_dir)/$(app_name).key ]; then \
-		$(occ) libresign:install --all --architecture aarch64; \
-		$(occ) libresign:install --all --architecture x86_64; \
-		$(occ) libresign:developer:sign-setup --privateKey=$(cert_dir)/$(app_name).key \
+		chown -R www-data:www-data $(project_directory) ; \
+		curl -o $(cert_dir)/$(app_name).crt \
+			"https://github.com/nextcloud/app-certificate-requests/raw/master/$(app_name)/$(app_name).crt"; \
+		php ../../occ libresign:install --all --architecture aarch64; \
+		php ../../occ libresign:install --all --architecture x86_64; \
+		echo "Signing setup files…"; \
+		php lib/Command/Developer/SignSetupApplication.php \
+			libresign:developer:sign-setup \
+			--privateKey=$(cert_dir)/$(app_name).key \
 			--certificate=$(cert_dir)/$(app_name).crt; \
+		cp -r appinfo $(appstore_sign_dir)/$(app_name); \
 		echo "Signing app files…"; \
-		$(occ) integrity:sign-app \
+		php ../../occ integrity:sign-app \
 			--privateKey=$(cert_dir)/$(app_name).key\
 			--certificate=$(cert_dir)/$(app_name).crt\
 			--path=$(appstore_sign_dir)/$(app_name); \

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -60,7 +60,6 @@ Developed with ❤️ by [LibreCode](https://librecode.coop). Help us transform
         <command>OCA\Libresign\Command\Configure\Cfssl</command>
         <command>OCA\Libresign\Command\Configure\OpenSsl</command>
         <command>OCA\Libresign\Command\Developer\Reset</command>
-        <command>OCA\Libresign\Command\Developer\SignSetup</command>
         <command>OCA\Libresign\Command\Install</command>
         <command>OCA\Libresign\Command\Uninstall</command>
     </commands>

diff --git a/appinfo/install-aarch64-cfssl.json b/appinfo/install-aarch64-cfssl.json