Skip to content

Commit

Permalink
Merge branch 'master' into beta
Browse files Browse the repository at this point in the history
* master:
  Update POT files using the production database
  Update translations from Transifex
  MBS-12328: Add #content to entity/Edits for artwork display (#2502)
  MBS-12336: Validate that Predicate::Set is being passed integers (#2509)
  MBS-12333: Block smart links: share.amuse.io (#2501)
  Run all sql before enabling replication triggers (#2539)
  MBS-12412: Fail gracefully if requesting an invalid ID in edit-cover-art (#2547)
  MBS-12387: Add titles to URL editor edit buttons (#2550)
  Bump react-table to 7.8.0 (#2551)
  MBS-12407: Add tobarandualchais.co.uk to the other dbs whitelist (#2545)
  MBS-12280 (II): Add target _blank to more edit form links (#2546)
  MBS-12413: Use uri_escape_utf8 on Data::Wikidoc (#2548)
  ExportAllTables.t: remove --nodbmirror2 flags (#2538)
  MBS-12398: Update release_meta.amazon_asin (#2543)
  Bump Flow to 0.179.0
  JSON dumps: ignore more useless primary/foreign keys (#2536)
  MBS-12404: Replace Text::Unaccent (#2542)
  MBS-12353: Actually check proposed ratings are allowed (#2511)
  MBS-8193 / MBS-12332: Wrap absurdly long lines (#2516)
  MBS-11694: Cleanup /intent/user Twitter URLs (#2519)
  MBS-8875: Improve CatNoLooksLikeASIN regexp (#2520)
  MBS-12347: Also show RG artist in autocomplete if type is null (#2517)
  MBS-12385: Add report for digital releases with mail order rels (#2535)
  MBS-12212: Add tests for event filtering
  MBS-12212: Allow filtering event list by setlist contents
  MBS-12212: Add filtering to artists' events tab
  Update react, react-dom to v18 (#2544)
  Bump Flow to 0.178.1
  Upgrade Flow to 0.178.0
  Fix spammy PG warnings in ProcessReplicationChanges
  Remove BundleReplicationPackets
  MBS-4960: Give useful error when checking donation status fails
  MBS-12361: Allow navigation from donation check page
  • Loading branch information
reosarevok committed May 30, 2022
2 parents 422962f + 9fbd4e7 commit 936153b
Show file tree
Hide file tree
Showing 127 changed files with 2,175 additions and 1,030 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Expand Up @@ -3,7 +3,7 @@ version: 2.1
executors:
musicbrainz-tests:
docker:
- image: metabrainz/musicbrainz-tests:v-2022-05.4
- image: metabrainz/musicbrainz-tests:v-2022-05.5
user: root
working_directory: /home/musicbrainz/musicbrainz-server

Expand Down
12 changes: 4 additions & 8 deletions admin/RunExport
Expand Up @@ -36,24 +36,20 @@ fi
# export then $EXPORT_STAMP is empty, so that argument is ignored.

mkdir -m "$BACKUP_DIR_MODE" -p \
"$BACKUP_DIR"/fullexport/ \
"$BACKUP_DIR"/fullexport/"$EXPORT_STAMP" \
"$BACKUP_DIR"/replication/{daily,weekly}
"$BACKUP_DIR"/replication/
chown "$BACKUP_USER:$BACKUP_GROUP" \
"$BACKUP_DIR"/fullexport/ \
"$BACKUP_DIR"/fullexport/"$EXPORT_STAMP" \
"$BACKUP_DIR"/replication \
"$BACKUP_DIR"/replication/{daily,weekly}
"$BACKUP_DIR"/replication

mkdir -m "$FTP_DIR_MODE" -p \
"$FTP_DATA_DIR"/fullexport/ \
"$FTP_DATA_DIR"/fullexport/"$EXPORT_STAMP" \
"$FTP_DATA_DIR"/replication/{daily,weekly}
"$FTP_DATA_DIR"/replication
chown "$FTP_USER:$FTP_GROUP" \
"$FTP_DATA_DIR"/fullexport/ \
"$FTP_DATA_DIR"/fullexport/"$EXPORT_STAMP" \
"$FTP_DATA_DIR"/replication \
"$FTP_DATA_DIR"/replication/{daily,weekly}
"$FTP_DATA_DIR"/replication

echo Making database snapshot
./admin/ExportAllTables \
Expand Down
9 changes: 0 additions & 9 deletions admin/cron/daily.sh
Expand Up @@ -69,15 +69,6 @@ then
fi
./admin/RunExport ${FULL:-}

# Do any necessary packet bundling
echo Bundling replication packets, daily
./admin/replication/BundleReplicationPackets $FTP_DATA_DIR/replication --period daily --require-previous
if date +%w | grep -qw '[6]'
then
echo + weekly
./admin/replication/BundleReplicationPackets $FTP_DATA_DIR/replication --period weekly --require-previous
fi

# Create the reports
echo Running reports
nice ./admin/RunReports.pl
Expand Down
230 changes: 0 additions & 230 deletions admin/replication/BundleReplicationPackets

This file was deleted.

0 comments on commit 936153b

Please sign in to comment.