From f1287e98680b7e832c3dabbdf538db798cf9eea2 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 26 Mar 2020 08:35:08 +1100
Subject: [PATCH] Working on github actions (#3545)

* Update .env.ci

* Update .env.ci

* Update .env.ci

* Update .env.example

* Update release.yml

* Update release.yml

* Update .env.ci
---
 .env.ci                       | 11 +++++------
 .env.example                  |  2 ++
 .github/workflows/release.yml |  6 +++++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.env.ci b/.env.ci
index 8e4c86eb2051..407e82e82624 100644
--- a/.env.ci
+++ b/.env.ci
@@ -3,13 +3,12 @@ APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://ninja.test
-DB_CONNECTION=db-ninja-01
-DB_DATABASE1=ninja
 MULTI_DB_ENABLED=false
 # database
-DB_HOST1=localhost
-DB_PORT1=3306
-DB_USERNAME1=root
-DB_PASSWORD1=ninja
+DB_CONNECTION=db-ninja-01
+DB_DATABASE=ninja
+DB_USERNAME=root
+DB_PASSWORD=ninja
+
 NINJA_ENVIRONMENT=selfhost
 COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}'
diff --git a/.env.example b/.env.example
index 41da546e1f3b..895e0c40f432 100644
--- a/.env.example
+++ b/.env.example
@@ -55,3 +55,5 @@ SELF_UPDATER_REPO_NAME = invoiceninja
 SELF_UPDATER_USE_BRANCH = v2
 SELF_UPDATER_MAILTO_ADDRESS = user@example.com
 SELF_UPDATER_MAILTO_NAME = "John Doe"
+COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}'
+
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e08996be68a7..61ec772ac7ec 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,6 +19,10 @@ jobs:
         with:
           ref: v2
           
+      - name: Copy .env file
+        run: |
+          cp .env.example .env
+             
       - name: Install composer dependencies
         run: |
           composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
@@ -42,7 +46,7 @@ jobs:
       
       - name: Get tag name
         id: get_tag_name
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}-release
       
       - name: Create Release
         id: create_release