Skip to content

Commit

Permalink
[chore] Remove meteor-method fork (#186)
Browse files Browse the repository at this point in the history
Unnecessary since jam:method 1.6.0
  • Loading branch information
williambelle authored Jan 20, 2025
1 parent f257644 commit a176f2d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ RUN curl https://install.meteor.com/?release=$METEOR_VERSION | bash -e -x
COPY ./app /usr/src/app/
WORKDIR /usr/src/app/
RUN set -e -x; rm -rf packages/; mkdir packages; cd packages; \
git clone -b update-to-async https://@github.com/sebastianspiller/meteor-synced-cron; \
git clone -b feature/meteor-3-0-compat https://github.com/epfl-si/meteor-method
git clone -b update-to-async https://@github.com/sebastianspiller/meteor-synced-cron

# Compile the API's documentation in a single file
RUN meteor npx apidoc --single -i server/ -o public/api/ -c apidoc.json
Expand Down
8 changes: 2 additions & 6 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 app/packages/meteor-synced-cron app/packages/method
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 app/packages/meteor-synced-cron app/packages/method
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 @@ -193,10 +193,6 @@ app/packages/meteor-synced-cron:
@mkdir -p $(dir $@) || true
cd $(dir $@); git clone -b update-to-async [email protected]:sebastianspiller/meteor-synced-cron.git

app/packages/method:
@mkdir -p $(dir $@) || true
cd $(dir $@); git clone -b feature/meteor-3-0-compat [email protected]:epfl-si/meteor-method.git

################################################################################
# Targets for development purpose only #
################################################################################
Expand Down

0 comments on commit a176f2d

Please sign in to comment.