Skip to content

Commit

Permalink
cicd: get pr number earlier
Browse files Browse the repository at this point in the history
  • Loading branch information
Naramsim committed Dec 13, 2023
1 parent bd6b4c8 commit 4d09894
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Resources/scripts/updater.sh
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ run_updater() {
cd "$data_repo/updater" || cleanexit 'fail' "Failed to cd"
# Wait to be sure PokeAPI/pokeapi's master branch has been updated on Github with the lastest merged PR content
sleep 10
engine_repo_pr_number=$(get_invokator_pr_number)

# Build the updater image
docker build -t pokeapi-updater .
Expand All @@ -177,7 +178,7 @@ run_updater() {

# Run the updater
docker network create pokeapi
docker run --privileged --network pokeapi --network-alias docker -e REPO_POKEAPI_CHECKOUT_OBJECT="$CIRCLE_SHA1" -e COMMIT_EMAIL="$email" -e COMMIT_NAME="$username" -e BRANCH_NAME="$branch_name" -e REPO_POKEAPI="https://github.com/$org/$engine_repo.git" -e REPO_DATA="https://$MACHINE_USER_GITHUB_API_TOKEN@github.com/$org/$data_repo.git" -e COMMIT_MESSAGE="[Updater Bot] Regenerate data from https://github.com/$org/$engine_repo/pull/$(get_invokator_pr_number)" -e COMMIT_AND_PUSH='true' -e RUN_AS='root' pokeapi-updater
docker run --privileged --network pokeapi --network-alias docker -e REPO_POKEAPI_CHECKOUT_OBJECT="$CIRCLE_SHA1" -e COMMIT_EMAIL="$email" -e COMMIT_NAME="$username" -e BRANCH_NAME="$branch_name" -e REPO_POKEAPI="https://github.com/$org/$engine_repo.git" -e REPO_DATA="https://$MACHINE_USER_GITHUB_API_TOKEN@github.com/$org/$data_repo.git" -e COMMIT_MESSAGE="[Updater Bot] Regenerate data from https://github.com/$org/$engine_repo/pull/$engine_repo_pr_number" -e COMMIT_AND_PUSH='true' -e RUN_AS='root' pokeapi-updater
return_code=$?
if [ "$return_code" -eq 2 ]; then
cleanexit 'no-new-data' "Generated data is the same as old data, skipping deploy"
Expand Down

0 comments on commit 4d09894

Please sign in to comment.