Skip to content

Commit

Permalink
[depends] percolate:meteor-synced-cron at (forked) version 2.0.0
Browse files Browse the repository at this point in the history
Because `percolate:meteor-synced-cron` uses MongoDB to store its state, we need to merge in [PR 149](percolatestudio/meteor-synced-cron#149) for Meteor 3.0 compatibility, which the maintainer has yet to do at the time of this commit.

- Make it so that all the runtime environments (`Makefile` for development; `Dockerfile` for integration and production) apply the [proper technique](https://guide.meteor.com/v1.3/writing-atmosphere-packages.html#overriding-atmosphere-packages) to use the forked package
- Enroll the forked package into `.meteor/packages` / `.meteor/versions` with
  ```shell
  meteor add percolate:synced-cron
  ```
  • Loading branch information
Dominique Quatravaux committed May 29, 2024
1 parent 855a2af commit cb2d6d8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ FROM ubuntu:focal

ENV METEOR_VERSION=3.0-rc.2

RUN apt -qy update && apt -qy install curl build-essential python3
RUN apt -qy update && apt -qy install curl build-essential python3 git
RUN curl https://install.meteor.com/?release=$METEOR_VERSION | bash -e -x

COPY ./app /usr/src/app/
WORKDIR /usr/src/app/
RUN cd packages/; rm -rf meteor-synced-cron; git clone -b update-to-async https://@github.com/sebastianspiller/meteor-synced-cron
RUN meteor npm i
RUN BROWSERSLIST_IGNORE_OLD_DATA=1 meteor build --allow-superuser /usr --directory
RUN cd /usr/bundle/programs/server && meteor npm install
Expand Down
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ print-env: check-env
@echo "MOCHA_TIMEOUT=${MOCHA_TIMEOUT}"

.PHONY: meteor
meteor: check-env
meteor: check-env app/packages/meteor-synced-cron
@echo '**** Start meteor: ****'
cd app/; env WP_VERITAS_BOT_TOKEN=$$WP_VERITAS_BOT_TOKEN_TEST WP_VERITAS_ALERTS_TELEGRAM_IDS=$$WP_VERITAS_ALERTS_TELEGRAM_IDS_TEST WP_VERITAS_AWX_TOKEN=$$AWX_TOKEN meteor --settings meteor-settings.json

.PHONY: test
test: check-env
test: check-env app/packages/meteor-synced-cron
@echo '**** Run test: ****'
@cd app; env MOCHA_TIMEOUT=$$MOCHA_TIMEOUT WP_VERITAS_BOT_TOKEN=$$WP_VERITAS_BOT_TOKEN_TEST WP_VERITAS_ALERTS_TELEGRAM_IDS=$$WP_VERITAS_ALERTS_TELEGRAM_IDS_TEST TEST_WATCH=1 meteor test --full-app --driver-package meteortesting:mocha --port 3888

Expand Down Expand Up @@ -189,6 +189,10 @@ publish:
$(MAKE) docker-push
$(MAKE) git-tag

app/packages/meteor-synced-cron:
@mkdir -p $(dir $@) || true
cd $(dir $@); git clone -b update-to-async [email protected]:sebastianspiller/meteor-synced-cron.git

################################################################################
# Targets for development purpose only #
################################################################################
Expand Down
1 change: 1 addition & 0 deletions app/.meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ harrison:papa-parse # Export CSV
pfafman:filesaver # Export CSV
alanning:[email protected]
ostrio:logger
percolate:synced-cron
1 change: 1 addition & 0 deletions app/.meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ [email protected]
[email protected]
ostrio:[email protected]
peppelg:[email protected]
percolate:[email protected]
pfafman:[email protected]_1
[email protected]
[email protected]
Expand Down

0 comments on commit cb2d6d8

Please sign in to comment.