diff --git a/upstream-wpt-webhook/files/config.json b/upstream-wpt-webhook/files/config.json index bc81d253..36789a04 100644 --- a/upstream-wpt-webhook/files/config.json +++ b/upstream-wpt-webhook/files/config.json @@ -4,5 +4,6 @@ "wpt_path": "./web-platform-tests", "upstream_org": "w3c", "servo_org": "servo", - "port": 5001 + "port": 5001, + "api": "https://api.github.com/" } diff --git a/upstream-wpt-webhook/init.sls b/upstream-wpt-webhook/init.sls index 85e93bcc..a22786f6 100644 --- a/upstream-wpt-webhook/init.sls +++ b/upstream-wpt-webhook/init.sls @@ -23,6 +23,9 @@ upstream-wpt-webhook: - require: - pkg: python3 - pip: virtualenv + pkg.installed: + - pkgs: + - patchutils pip.installed: - pkgs: - git+https://github.com/servo-automation/upstream-wpt-sync-webhook@{{ webhook.rev }} @@ -36,21 +39,12 @@ upstream-wpt-webhook: - name: wpt-webhook - require: - pip: upstream-wpt-webhook - - git: web-platform-tests - watch: - file: /home/wpt-sync/upstream-wpt-sync-webhook/config.json - file: /etc/init/wpt-webhook.conf - pip: upstream-wpt-webhook {% endif %} -web-platform-tests: - git.latest: - - user: wpt-sync - - branch: master - - depth: 1 - - target: /home/wpt-sync/upstream-wpt-sync-webhook/web-platform-tests - - name: https://github.com/w3c/web-platform-tests.git - /home/wpt-sync/upstream-wpt-sync-webhook/config.json: file.managed: - source: salt://{{ tpldir }}/files/config.json diff --git a/upstream-wpt-webhook/map.jinja b/upstream-wpt-webhook/map.jinja index 639eaec7..50ce7264 100644 --- a/upstream-wpt-webhook/map.jinja +++ b/upstream-wpt-webhook/map.jinja @@ -1,5 +1,5 @@ {% set webhook = { - 'rev': '21cc4c1b9c46aa5d955611100d2bae716a163179' + 'rev': '6aff94b149ec5a0e9ab0d86f32b090740fa4ba4e' } %}