Skip to content

Commit b435401

Browse files
committed
Move protomaps server URL into GitHub secrets along with new API key
Update GitHub workflows to extract the values into local.properties.
1 parent 7611b89 commit b435401

14 files changed

Lines changed: 114 additions & 281 deletions

File tree

.github/workflows/build-app.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,13 @@ jobs:
7070
id: get-version
7171
run: echo "VERSION=$(git describe --tags)" >> $GITHUB_OUTPUT
7272

73-
#- name: Setup tile provider API key
74-
# env:
75-
# TILE_PROVIDER_API_KEY: ${{ secrets.TILE_PROVIDER_API_KEY }}
76-
# run: |
77-
# echo tileProviderApiKey=$TILE_PROVIDER_API_KEY > local.properties
73+
- name: Setup tile provider API key
74+
env:
75+
TILE_PROVIDER_API_KEY: ${{ secrets.TILE_PROVIDER_API_KEY }}
76+
TILE_PROVIDER_URL: ${{ secrets.TILE_PROVIDER_URL }}
77+
run: |
78+
echo tileProviderUrl=$TILE_PROVIDER_URL > local.properties
79+
echo tileProviderApiKey=$TILE_PROVIDER_API_KEY >> local.properties
7880
7981
- name: Decode Google services
8082
env:

.github/workflows/nightly.yaml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@ jobs:
4848
with:
4949
fetch-depth: 0
5050

51-
#- name: Setup tile provider API key
52-
# env:
53-
# TILE_PROVIDER_API_KEY: ${{ secrets.TILE_PROVIDER_API_KEY }}
54-
# run: |
55-
# echo tileProviderApiKey=$TILE_PROVIDER_API_KEY > local.properties
51+
- name: Setup tile provider
52+
env:
53+
TILE_PROVIDER_API_KEY: ${{ secrets.TILE_PROVIDER_API_KEY }}
54+
TILE_PROVIDER_URL: ${{ secrets.TILE_PROVIDER_URL }}
55+
run: |
56+
echo tileProviderUrl=$TILE_PROVIDER_URL > local.properties
57+
echo tileProviderApiKey=$TILE_PROVIDER_API_KEY >> local.properties
5658
5759
- name: Decode Google services
5860
env:
@@ -127,11 +129,13 @@ jobs:
127129
with:
128130
fetch-depth: 0
129131

130-
#- name: Setup tile provider API key
131-
# env:
132-
# TILE_PROVIDER_API_KEY: ${{ secrets.TILE_PROVIDER_API_KEY }}
133-
# run: |
134-
# echo tileProviderApiKey=$TILE_PROVIDER_API_KEY > local.properties
132+
- name: Setup tile provider
133+
env:
134+
TILE_PROVIDER_API_KEY: ${{ secrets.TILE_PROVIDER_API_KEY }}
135+
TILE_PROVIDER_URL: ${{ secrets.TILE_PROVIDER_URL }}
136+
run: |
137+
echo tileProviderUrl=$TILE_PROVIDER_URL > local.properties
138+
echo tileProviderApiKey=$TILE_PROVIDER_API_KEY >> local.properties
135139
136140
- name: Decode Google services
137141
env:

.github/workflows/run-tests.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,16 @@ jobs:
2525
with:
2626
fetch-depth: 0
2727

28+
- name: Setup tile provider
29+
env:
30+
TILE_PROVIDER_API_KEY: ${{ secrets.TILE_PROVIDER_API_KEY }}
31+
TILE_PROVIDER_URL: ${{ secrets.TILE_PROVIDER_URL }}
32+
run: |
33+
echo tileProviderUrl=$TILE_PROVIDER_URL > local.properties
34+
echo tileProviderApiKey=$TILE_PROVIDER_API_KEY >> local.properties
35+
cat local.properties
36+
echo $TILE_PROVIDER_URL | sed 's/./& /g'
37+
2838
- name: Setup Gradle
2939
uses: gradle/actions/setup-gradle@v4
3040

.github/workflows/tag-and-build-release.yaml

Lines changed: 0 additions & 244 deletions
This file was deleted.

.github/workflows/test.yaml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Test stuff
2+
3+
env:
4+
# The name of the main module repository
5+
main_project_module: app
6+
7+
# The name in the Play Store
8+
playstore_name: Soundscape
9+
10+
on:
11+
pull_request:
12+
branches: [ "main" ]
13+
14+
# Allows you to run this workflow manually from the Actions tab
15+
workflow_dispatch:
16+
17+
jobs:
18+
test:
19+
20+
runs-on: ubuntu-latest
21+
environment: development
22+
23+
steps:
24+
- uses: actions/checkout@v4
25+
with:
26+
fetch-depth: 0
27+
28+
- name: Setup tile provider
29+
env:
30+
TILE_PROVIDER_API_KEY: ${{ secrets.TILE_PROVIDER_API_KEY }}
31+
TILE_PROVIDER_URL: ${{ secrets.TILE_PROVIDER_URL }}
32+
run: |
33+
echo tileProviderUrl=$TILE_PROVIDER_URL > local.properties
34+
echo tileProviderApiKey=$TILE_PROVIDER_API_KEY >> local.properties
35+
echo $TILE_PROVIDER_URL | sed 's/./& /g'
36+
echo ${{ secrets.TILE_PROVIDER_URL }} | sed 's/./& /g'
37+
38+
- name: Setup Gradle
39+
uses: gradle/actions/setup-gradle@v4
40+
41+
- name: Setup tile provider
42+
env:
43+
TILE_PROVIDER_API_KEY: ${{ secrets.TILE_PROVIDER_API_KEY }}
44+
TILE_PROVIDER_URL: ${{ secrets.TILE_PROVIDER_URL }}
45+
run: |
46+
echo tileProviderUrl=$TILE_PROVIDER_URL > local.properties
47+
echo tileProviderApiKey=$TILE_PROVIDER_API_KEY >> local.properties
48+
echo $TILE_PROVIDER_URL | sed 's/./& /g'
49+
echo ${{ secrets.TILE_PROVIDER_URL }} | sed 's/./& /g'
50+

0 commit comments

Comments
 (0)