From ce9e4021093854e38ed06026f297d00524fa09bc Mon Sep 17 00:00:00 2001 From: Antonio Vanegas Date: Fri, 19 Feb 2021 17:04:48 +0100 Subject: [PATCH 1/2] added mapbox and gservices secrets from github secrets --- .github/workflows/android.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index d7bcf2f6c..00a8a2e76 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -13,12 +13,15 @@ jobs: - uses: actions/checkout@master - name: Checkout submodules uses: textbook/git-checkout-submodule-action@master - - name: Mock config files for CI + - name: Loading secrets + ¦ env: + ¦ gservices: ${{ secrets.gservices }} + ¦ mapboxtoken: ${{ secrets.mapboxtoken }} + ¦ run: | + ¦ echo $gservices > ./app/google-services.json + ¦ echo $mapboxtoken > ./app/src/main/res/values/mapbox-token.xml + - name: Mock curfirmware version for CI run: | - rm ./app/google-services.json - cp ./app/google-services-example.json ./app/google-services.json - rm ./app/src/main/res/values/mapbox-token.xml - cp ./app/special/mapbox-token.xml ./app/src/main/res/values/ rm ./app/src/main/res/values/curfirmwareversion.xml cp ./app/special/curfirmwareversion.xml ./app/src/main/res/values/ - name: set up JDK 1.8 From 16a5827962f2803a9634fe3b2751d41a1d65cada Mon Sep 17 00:00:00 2001 From: Antonio Vanegas Date: Fri, 19 Feb 2021 18:43:50 +0100 Subject: [PATCH 2/2] fixed identation issue reported for CI check --- .github/workflows/android.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 00a8a2e76..c0750c091 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -14,12 +14,12 @@ jobs: - name: Checkout submodules uses: textbook/git-checkout-submodule-action@master - name: Loading secrets - ¦ env: - ¦ gservices: ${{ secrets.gservices }} - ¦ mapboxtoken: ${{ secrets.mapboxtoken }} - ¦ run: | - ¦ echo $gservices > ./app/google-services.json - ¦ echo $mapboxtoken > ./app/src/main/res/values/mapbox-token.xml + env: + gservices: ${{ secrets.gservices }} + mapboxtoken: ${{ secrets.mapboxtoken }} + run: | + echo $gservices > ./app/google-services.json + echo $mapboxtoken > ./app/src/main/res/values/mapbox-token.xml - name: Mock curfirmware version for CI run: | rm ./app/src/main/res/values/curfirmwareversion.xml