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

build: workflows and exit with non-zero #120

Merged
merged 3 commits into from
Sep 4, 2024
Merged

build: workflows and exit with non-zero #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d1cdeb
build: use set -e to return non-zero and exit of heredoc session
trenc Sep 4, 2024
87a0e39
build: use set -e to return non-zero and exit of heredoc session
trenc Sep 4, 2024
df3cefe
fix: remove database name to be generic for all databases
trenc Sep 4, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/deploy-to-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ jobs:
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
run: |
ssh -tt -o StrictHostKeyChecking=no -p "$PORT" "${{ secrets.DEV_SSH_USER }}@$HOST" <<EOF
set -e
cd ${{ env.remote_path }}
tar -xf ${{ env.deployfile }}
chcon -t httpd_user_rw_content_t -R ${{ env.remote_folder}}.${{ env.now }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deploy-to-live.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ jobs:
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
run: |
ssh -tt -o StrictHostKeyChecking=no -p "$PORT" "${{ secrets.LIVE_SSH_USER }}@$HOST" <<EOF
set -e
cd ${{ env.remote_path }}
tar -xf ${{ env.deployfile }}
chcon -t httpd_user_rw_content_t -R ${{ env.remote_folder}}.${{ env.now }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deploy-to-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ jobs:
- name: Move and extract files
run: |
ssh -tt -i ~/.ssh/local_key -o StrictHostKeyChecking=no -p "$PORT" "$SSH_USER@$HOST" "sudo -i <<EOF
set -e
cd ${{ env.remote_path }}
tar -xf ${{ env.deployfile }}
chown -R www-data:www-data ${{ env.remote_folder }}.${{ env.now }}
Expand Down
36 changes: 18 additions & 18 deletions src/database/migrations/2024_05_03_094400_create_summary_stats_view_by_year.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,27 @@ public function up(): void
(
(
SELECT
YEAR(transcribathon.Score.Timestamp) AS Year,
transcribathon.Score.ScoreTypeId AS ScoreTypeId,
COUNT(DISTINCT transcribathon.Score.UserId) AS UniqueUsers,
COUNT(DISTINCT transcribathon.Score.ItemId) AS UniqueItems,
SUM(transcribathon.Score.Amount) AS Amount
YEAR(Score.Timestamp) AS Year,
Score.ScoreTypeId AS ScoreTypeId,
COUNT(DISTINCT Score.UserId) AS UniqueUsers,
COUNT(DISTINCT Score.ItemId) AS UniqueItems,
SUM(Score.Amount) AS Amount
FROM
transcribathon.Score
Score
GROUP BY
YEAR(transcribathon.Score.Timestamp),
transcribathon.Score.ScoreTypeId
YEAR(Score.Timestamp),
Score.ScoreTypeId
)
) t1
JOIN (
SELECT
YEAR(transcribathon.Score.Timestamp) AS Year,
COUNT(DISTINCT transcribathon.Score.UserId) AS UniqueUsers,
COUNT(DISTINCT transcribathon.Score.ItemId) AS UniqueItems
YEAR(Score.Timestamp) AS Year,
COUNT(DISTINCT Score.UserId) AS UniqueUsers,
COUNT(DISTINCT Score.ItemId) AS UniqueItems
FROM
transcribathon.Score
Score
GROUP BY
YEAR(transcribathon.Score.Timestamp)
YEAR(Score.Timestamp)
) t2 ON(
(t1.Year = t2.Year)
)
Expand All @@ -58,15 +58,15 @@ public function up(): void
COUNT(0) AS NumberOfFirstRecords
FROM
(
transcribathon.Score s
Score s
JOIN (
SELECT
transcribathon.Score.ItemId AS ItemId,
MIN(transcribathon.Score.ScoreId) AS FirstScoreId
Score.ItemId AS ItemId,
MIN(Score.ScoreId) AS FirstScoreId
FROM
transcribathon.Score
Score
GROUP BY
transcribathon.Score.ItemId
Score.ItemId
) firstRecords ON(
(
(s.ItemId = firstRecords.ItemId)
Expand Down