Skip to content

Commit 06799bc

Browse files
committed
Use the Trino run script in CI workflows
1 parent 8a8337a commit 06799bc

File tree

4 files changed

+5
-82
lines changed

4 files changed

+5
-82
lines changed

.github/workflows/optimize.yml

+2-23
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,14 @@ jobs:
1313
sync:
1414
runs-on: ubuntu-latest
1515
env:
16+
GITHUB_TOKEN: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
1617
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
1718
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
1819
AWS_REGION: ${{ secrets.AWS_REGION }}
19-
TRINO_VERSION: 445
2020
steps:
2121
- uses: actions/checkout@v4
2222
- name: Start Trino
23-
run: |
24-
CONTAINER_ID=$(docker run \
25-
-v $(pwd)/catalog/trinocicd.properties:/etc/trino/catalog/trinocicd.properties \
26-
-v $(pwd)/sql:/sql \
27-
-e AWS_ACCESS_KEY_ID \
28-
-e AWS_SECRET_ACCESS_KEY \
29-
-e AWS_REGION \
30-
-p 8080:8080 \
31-
--name trino \
32-
-d \
33-
trinodb/trino:$TRINO_VERSION)
34-
SERVER_IP=$(docker inspect --format '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$CONTAINER_ID")
35-
echo "CONTAINER_ID=$CONTAINER_ID" >> $GITHUB_ENV
36-
echo "SERVER_IP=$SERVER_IP" >> $GITHUB_ENV
37-
i=0
38-
until docker inspect "${CONTAINER_ID}" --format "{{json .State.Health.Status }}" | grep -q '"healthy"'; do
39-
if [[ $((i++)) -ge 10 ]]; then
40-
echo "🚨 Too many retries waiting for Trino to start"
41-
exit 1
42-
fi
43-
sleep 10
44-
done
23+
run: ./bin/run-trino.sh
4524
- name: Optimize tables
4625
run: |
4726
docker exec \

.github/workflows/reports.yml

+2-21
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,18 @@ jobs:
1616
run:
1717
runs-on: ubuntu-latest
1818
env:
19+
GITHUB_TOKEN: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
1920
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
2021
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2122
AWS_REGION: ${{ secrets.AWS_REGION }}
22-
TRINO_VERSION: 445
23-
TRINO_GIT_VERSION: "0.74"
2423
steps:
2524
- uses: actions/checkout@v4
2625
- name: Install dependencies
2726
run: |
2827
sudo apt update
2928
sudo pip install ansi2html
30-
curl -fLOsS https://github.com/nineinchnick/trino-git/releases/download/v$TRINO_GIT_VERSION/trino-git-$TRINO_GIT_VERSION.zip
31-
unzip trino-git-$TRINO_GIT_VERSION.zip
3229
- name: Start Trino
33-
run: |
34-
CONTAINER_ID=$(docker run \
35-
-v $(pwd)/trino-git-$TRINO_GIT_VERSION:/usr/lib/trino/plugin/git \
36-
-v $(pwd)/catalog/git.properties:/etc/trino/catalog/git.properties \
37-
-v $(pwd)/catalog/trinocicd.properties:/etc/trino/catalog/trinocicd.properties \
38-
-v $(pwd)/hive-cache:/opt/hive-cache \
39-
-e AWS_ACCESS_KEY_ID \
40-
-e AWS_SECRET_ACCESS_KEY \
41-
-e AWS_REGION \
42-
-p 8080:8080 \
43-
--name trino \
44-
-d \
45-
trinodb/trino:$TRINO_VERSION)
46-
SERVER_IP=$(docker inspect --format '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$CONTAINER_ID")
47-
echo "CONTAINER_ID=$CONTAINER_ID" >> $GITHUB_ENV
48-
echo "SERVER_IP=$SERVER_IP" >> $GITHUB_ENV
49-
until docker logs trino 2>&1 | grep --quiet --fixed-strings --max-count=1 "SERVER STARTED"; do sleep 1 ; done
30+
run: ./bin/run-trino.sh
5031
- name: Execute queries
5132
run: |
5233
./bin/reports.sh reports/ci-cd/index.md "Trino CI/CD Reports" sql/ci-cd/{health,success-ratio-per-day,runs-queue-time-per-day,runs-duration-per-day,runs-job-cumulative-duration-per-day,jobs-duration}.sql

.github/workflows/sync.yml

+1-36
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
1818
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
1919
AWS_REGION: ${{ secrets.AWS_REGION }}
20-
TRINO_VERSION: 445
2120
TRINO_REST_VERSION: "0.144"
2221
GITHUB_OWNER: trinodb
2322
GITHUB_REPO: trino
@@ -28,45 +27,11 @@ jobs:
2827
SYNC_TABLES: runs,jobs,steps,check_suites,check_runs,check_run_annotations,pulls,pull_commits,pull_stats,review_comments,reviews,issues,issue_comments,commits,teams,members
2928
steps:
3029
- uses: actions/checkout@v4
31-
- name: Download trino-rest
32-
run: |
33-
curl -fLOsS https://github.com/nineinchnick/trino-rest/releases/download/v$TRINO_REST_VERSION/trino-rest-github-$TRINO_REST_VERSION.zip
34-
unzip trino-rest-github-$TRINO_REST_VERSION.zip
3530
- name: Start Trino
3631
run: |
37-
cat <<EOF >config.properties
38-
coordinator=true
39-
node-scheduler.include-coordinator=true
40-
http-server.http.port=8080
41-
discovery.uri=http://localhost:8080
42-
query.max-memory-per-node=4086929818B
43-
EOF
44-
CONTAINER_ID=$(docker run \
45-
-v $(pwd)/config.properties:/etc/trino/config.properties \
46-
-v $(pwd)/trino-rest-github-$TRINO_REST_VERSION:/usr/lib/trino/plugin/github \
47-
-v $(pwd)/catalog/github.properties:/etc/trino/catalog/github.properties \
48-
-v $(pwd)/catalog/trinocicd.properties:/etc/trino/catalog/trinocicd.properties \
49-
-v $(pwd)/hive-cache:/opt/hive-cache \
50-
-v $(pwd)/sql:/sql \
51-
-e AWS_ACCESS_KEY_ID \
52-
-e AWS_SECRET_ACCESS_KEY \
53-
-e AWS_REGION \
54-
-e GITHUB_TOKEN \
55-
-p 8080:8080 \
56-
--name trino \
57-
-d \
58-
trinodb/trino:$TRINO_VERSION)
32+
./bin/run-trino.sh
5933
SERVER_IP=$(docker inspect --format '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$CONTAINER_ID")
60-
echo "CONTAINER_ID=$CONTAINER_ID" >> $GITHUB_ENV
6134
echo "SERVER_IP=$SERVER_IP" >> $GITHUB_ENV
62-
i=0
63-
until docker inspect "${CONTAINER_ID}" --format "{{json .State.Health.Status }}" | grep -q '"healthy"'; do
64-
if [[ $((i++)) -ge 10 ]]; then
65-
echo "🚨 Too many retries waiting for Trino to start"
66-
exit 1
67-
fi
68-
sleep 10
69-
done
7035
- name: Run Sync
7136
run: |
7237
docker run \

.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,6 @@ dist
107107
.idea
108108

109109
# custom Trino connectors
110-
/trino-rest-github-*
111-
/trino-git-*
112110
/bin/trino-rest-github-*
113111
/bin/trino-git-*
114112
/bin/config.properties

0 commit comments

Comments
 (0)