From fb8e448f5c8e7a4108b17db36e55bcdb4439a0dd Mon Sep 17 00:00:00 2001 From: Ace Date: Thu, 8 Sep 2022 22:26:20 +0200 Subject: [PATCH 1/7] support for env var --- .github/workflows/tests.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5854e94..383fd65 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,14 +25,19 @@ jobs: source venv/bin/activate python -m pip install --upgrade pip - - name: Install dependencies and run + - name: Install dependencies run: | pip install wheel pip install -e ./ cd inkycal/modules && ls -al + + - name: Run tests + env: + OPENWEATHERMAP_API_KEY: secrets.OPENWEATHERMAP_API_KEY + + run: | cd .. cd tests wget https://raw.githubusercontent.com/aceisace/Inkycal/assets/tests/settings.json - sed -i 's/"api_key":.*/"api_key": "${{secrets.OPENWEATHERMAP_API_KEY}}",/' settings.json - sed -i 's/secret_key =.*/secret_key = "${{secrets.OPENWEATHERMAP_API_KEY}}"/' inkycal_weather_test.py + # sed -i 's/"api_key":.*/"api_key": "${{secrets.OPENWEATHERMAP_API_KEY}}",/' settings.json for f in *.py; do python3 "$f"; done From c19cbf733f7a04803a7069f2b56d056dfab3d1c0 Mon Sep 17 00:00:00 2001 From: Ace Date: Thu, 8 Sep 2022 22:29:49 +0200 Subject: [PATCH 2/7] Update tests.yml --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 383fd65..54a5181 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -29,14 +29,14 @@ jobs: run: | pip install wheel pip install -e ./ - cd inkycal/modules && ls -al + # cd inkycal/modules && ls -al - name: Run tests env: OPENWEATHERMAP_API_KEY: secrets.OPENWEATHERMAP_API_KEY run: | - cd .. + #cd .. cd tests wget https://raw.githubusercontent.com/aceisace/Inkycal/assets/tests/settings.json # sed -i 's/"api_key":.*/"api_key": "${{secrets.OPENWEATHERMAP_API_KEY}}",/' settings.json From d8eb4d52f6cc28425af3cc4f2531ffa5e5e2f82c Mon Sep 17 00:00:00 2001 From: Ace Date: Thu, 8 Sep 2022 22:33:48 +0200 Subject: [PATCH 3/7] Update tests.yml --- .github/workflows/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 54a5181..3bd9edf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,6 +27,7 @@ jobs: - name: Install dependencies run: | + echo "$PWD" pip install wheel pip install -e ./ # cd inkycal/modules && ls -al @@ -36,7 +37,8 @@ jobs: OPENWEATHERMAP_API_KEY: secrets.OPENWEATHERMAP_API_KEY run: | - #cd .. + echo "$PWD" + # cd .. cd tests wget https://raw.githubusercontent.com/aceisace/Inkycal/assets/tests/settings.json # sed -i 's/"api_key":.*/"api_key": "${{secrets.OPENWEATHERMAP_API_KEY}}",/' settings.json From 86cbcab3b1929c545c6edbaa519eddecf6901bf1 Mon Sep 17 00:00:00 2001 From: Ace Date: Thu, 8 Sep 2022 22:38:45 +0200 Subject: [PATCH 4/7] Update tests.yml --- .github/workflows/tests.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3bd9edf..e27c075 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,20 +25,13 @@ jobs: source venv/bin/activate python -m pip install --upgrade pip - - name: Install dependencies + - name: Install dependencies and run tests + env: + OPENWEATHERMAP_API_KEY: secrets.OPENWEATHERMAP_API_KEY run: | echo "$PWD" pip install wheel pip install -e ./ - # cd inkycal/modules && ls -al - - - name: Run tests - env: - OPENWEATHERMAP_API_KEY: secrets.OPENWEATHERMAP_API_KEY - - run: | - echo "$PWD" - # cd .. cd tests wget https://raw.githubusercontent.com/aceisace/Inkycal/assets/tests/settings.json # sed -i 's/"api_key":.*/"api_key": "${{secrets.OPENWEATHERMAP_API_KEY}}",/' settings.json From 7c521c1982b92e6753091098c6df8a51c42eabfb Mon Sep 17 00:00:00 2001 From: Ace Date: Thu, 8 Sep 2022 22:43:20 +0200 Subject: [PATCH 5/7] Update tests.yml --- .github/workflows/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e27c075..526280a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,6 +32,8 @@ jobs: echo "$PWD" pip install wheel pip install -e ./ + cd inkycal/modules && ls -al + cd .. cd tests wget https://raw.githubusercontent.com/aceisace/Inkycal/assets/tests/settings.json # sed -i 's/"api_key":.*/"api_key": "${{secrets.OPENWEATHERMAP_API_KEY}}",/' settings.json From 321784b3683daab35cfce774438415e911eed978 Mon Sep 17 00:00:00 2001 From: Ace Date: Thu, 8 Sep 2022 22:50:45 +0200 Subject: [PATCH 6/7] Update tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 526280a..8b831de 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,7 @@ jobs: - name: Install dependencies and run tests env: - OPENWEATHERMAP_API_KEY: secrets.OPENWEATHERMAP_API_KEY + OPENWEATHERMAP_API_KEY: ${{ secrets.OPENWEATHERMAP_API_KEY }} run: | echo "$PWD" pip install wheel From 5ffdb9f90e308957e3e5d5e6e405882caf087fa9 Mon Sep 17 00:00:00 2001 From: Ace Date: Thu, 8 Sep 2022 22:58:09 +0200 Subject: [PATCH 7/7] Update tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8b831de..d855c48 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -36,5 +36,5 @@ jobs: cd .. cd tests wget https://raw.githubusercontent.com/aceisace/Inkycal/assets/tests/settings.json - # sed -i 's/"api_key":.*/"api_key": "${{secrets.OPENWEATHERMAP_API_KEY}}",/' settings.json + sed -i 's/"api_key":.*/"api_key": "${{secrets.OPENWEATHERMAP_API_KEY}}",/' settings.json for f in *.py; do python3 "$f"; done