Skip to content

Commit b81f612

Browse files
authored
Reorder env vars and removed success log from bash script
1 parent b2a8958 commit b81f612

File tree

4 files changed

+29
-13
lines changed

4 files changed

+29
-13
lines changed

.github/workflows/register-commands-production.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,25 @@ on:
33
push:
44
branches: main
55
jobs:
6+
Environment-Variables-Check:
7+
runs-on: ubuntu-latest
8+
environment: production
9+
steps:
10+
- uses: actions/checkout@v2
11+
- run: bash environment-variables-validator.sh
12+
env:
13+
DISCORD_APPLICATION_ID: ${{secrets.DISCORD_APPLICATION_ID}}
14+
DISCORD_GUILD_ID: ${{secrets.DISCORD_GUILD_ID}}
15+
DISCORD_TOKEN: ${{secrets.DISCORD_TOKEN}}
16+
DISCORD_PUBLIC_KEY: ${{secrets.DISCORD_PUBLIC_KEY}}
17+
CLOUDFLARE_API_TOKEN: ${{secrets.CLOUDFLARE_API_TOKEN}}
18+
CLOUDFLARE_ACCOUNT_ID: ${{secrets.CLOUDFLARE_ACCOUNT_ID}}
19+
BOT_PRIVATE_KEY: ${{secrets.BOT_PRIVATE_KEY}}
20+
RDS_SERVERLESS_PUBLIC_KEY: ${{secrets.RDS_SERVERLESS_PUBLIC_KEY}}
21+
CRON_JOBS_PUBLIC_KEY: ${{secrets.CRON_JOBS_PUBLIC_KEY}}
22+
IDENTITY_SERVICE_PUBLIC_KEY: ${{secrets.IDENTITY_SERVICE_PUBLIC_KEY}}
623
Register-Commands:
24+
needs: [Environment-Variables-Check]
725
runs-on: ubuntu-latest
826
environment: production
927
steps:

.github/workflows/register-commands-staging.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ jobs:
1111
- run: bash environment-variables-validator.sh
1212
env:
1313
DISCORD_APPLICATION_ID: ${{secrets.DISCORD_APPLICATION_ID}}
14-
CLOUDFLARE_API_TOKEN: ${{secrets.CLOUDFLARE_API_TOKEN}}
15-
DISCORD_PUBLIC_KEY: ${{secrets.DISCORD_PUBLIC_KEY}}
14+
DISCORD_GUILD_ID: ${{secrets.DISCORD_GUILD_ID}}
1615
DISCORD_TOKEN: ${{secrets.DISCORD_TOKEN}}
16+
DISCORD_PUBLIC_KEY: ${{secrets.DISCORD_PUBLIC_KEY}}
17+
CLOUDFLARE_API_TOKEN: ${{secrets.CLOUDFLARE_API_TOKEN}}
18+
CLOUDFLARE_ACCOUNT_ID: ${{secrets.CLOUDFLARE_ACCOUNT_ID}}
1719
BOT_PRIVATE_KEY: ${{secrets.BOT_PRIVATE_KEY}}
18-
DISCORD_GUILD_ID: ${{secrets.DISCORD_GUILD_ID}}
1920
RDS_SERVERLESS_PUBLIC_KEY: ${{secrets.RDS_SERVERLESS_PUBLIC_KEY}}
2021
CRON_JOBS_PUBLIC_KEY: ${{secrets.CRON_JOBS_PUBLIC_KEY}}
2122
IDENTITY_SERVICE_PUBLIC_KEY: ${{secrets.IDENTITY_SERVICE_PUBLIC_KEY}}
22-
CLOUDFLARE_ACCOUNT_ID: ${{secrets.CLOUDFLARE_ACCOUNT_ID}}
2323
Register-Commands:
2424
needs: [Environment-Variables-Check]
2525
runs-on: ubuntu-latest
@@ -64,4 +64,4 @@ jobs:
6464
DISCORD_GUILD_ID: ${{secrets.DISCORD_GUILD_ID}}
6565
RDS_SERVERLESS_PUBLIC_KEY: ${{secrets.RDS_SERVERLESS_PUBLIC_KEY}}
6666
CRON_JOBS_PUBLIC_KEY: ${{secrets.CRON_JOBS_PUBLIC_KEY}}
67-
IDENTITY_SERVICE_PUBLIC_KEY: ${{secrets.IDENTITY_SERVICE_PUBLIC_KEY}}
67+
IDENTITY_SERVICE_PUBLIC_KEY: ${{secrets.IDENTITY_SERVICE_PUBLIC_KEY}}

environment-variables-validator.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,5 @@ while IFS= read -r var_name; do
1313
if [[ -z "${!var_name}" ]]; then
1414
echo "Environment variable $var_name is not set."
1515
exit 1 # Exit with error if any variable is not set
16-
else
17-
echo "Environment variable $var_name is set."
1816
fi
1917
done < "$ENV_VARS_FILE"

environment-variables.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
DISCORD_PUBLIC_KEY
2-
DISCORD_TOKEN
3-
DISCORD_GUILD_ID
41
DISCORD_APPLICATION_ID
5-
CURRENT_ENVIRONMENT
2+
DISCORD_GUILD_ID
3+
DISCORD_TOKEN
4+
DISCORD_PUBLIC_KEY
5+
CLOUDFLARE_API_TOKEN
6+
CLOUDFLARE_ACCOUNT_ID
67
BOT_PRIVATE_KEY
78
RDS_SERVERLESS_PUBLIC_KEY
89
CRON_JOBS_PUBLIC_KEY
9-
IDENTITY_SERVICE_PUBLIC_KEY
10-
CLOUDFLARE_ACCOUNT_ID
10+
IDENTITY_SERVICE_PUBLIC_KEY

0 commit comments

Comments
 (0)