From da8e3443c4d8c2fb4b9382d0e54d82faaca9ecf3 Mon Sep 17 00:00:00 2001 From: Denis Zunke Date: Tue, 23 Feb 2021 18:25:57 +0100 Subject: [PATCH] Use HEAD instead of master for phpdesktop build --- .github/workflows/ci.yml | 1 + Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a481d92..4f5dc55 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - 1.x jobs: ci: runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index 02f34a3..76b0798 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ phpdesktop: ## build phpdesktop release cd build/php; unzip php-8.0-nts-Win32-vs16-x86-latest.zip cd build/php; rm php-8.0-nts-Win32-vs16-x86-latest.zip - git archive master | (cd build/www; tar x) + git archive HEAD | (cd build/www; tar x) cd build/www; mv config/phpdesktop/php.ini ../php cd build/www; mv config/phpdesktop/settings.json ../ cd build/www; mv .env.prod .env