Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use environment files instead of set-output command #1799

Merged
merged 2 commits into from
Dec 9, 2022
Merged

Use environment files instead of set-output command #1799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e4e224
Use environment files instead of set-output command
jpopelka Dec 7, 2022
8bd6b71
Don't install python3-eventlet for worker
jpopelka Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/rebuild-and-push-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
image: packit-service-tests

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Extract branch name and set tag
shell: bash
Expand All @@ -36,9 +36,9 @@ jobs:
tag="prod"
;;
esac
echo "::set-output name=branch::${branch}"
echo "branch=${branch}" >> $GITHUB_OUTPUT
unique_tag="${branch}-${GITHUB_SHA::7}-$(date +%s)"
echo "::set-output name=tag::${tag} ${unique_tag}"
echo "tag=${tag} ${unique_tag}" >> $GITHUB_OUTPUT
id: branch_tag

- name: Build Image
Expand Down
4 changes: 1 addition & 3 deletions files/install-deps-worker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@
- postgresql # pg_dump
- python3-boto3 # AWS (S3)
- python3-fasjson-client
# remove if we decide not to use concurrency
- python3-eventlet
- python3-gevent
- python3-gevent # concurrency pool, see run_worker.sh
# v6 = bodhi-client, v5 = python3-bodhi{,-client}
- bodhi-client
# needed when installing from koji - there are no GPG-signed packages
Expand Down
2 changes: 1 addition & 1 deletion files/run_worker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ elif [[ "${CELERY_COMMAND}" == "worker" ]]; then
CONCURRENCY="${CONCURRENCY:-$DEFAULT_CONCURRENCY}"
export CONCURRENCY

# Options: prefork | eventlet | gevent | solo
# Options: solo | gevent
# https://www.distributedpython.com/2018/10/26/celery-execution-pool/
DEFAULT_POOL="solo"
DEFAULT_CONCURRENCY_POOL="gevent"
Expand Down