Skip to content

Commit

Permalink
Merge pull request #154 from StackStorm/remove-hipchat
Browse files Browse the repository at this point in the history
Remove HipChat adapter
  • Loading branch information
blag authored Jul 9, 2020
2 parents bbfdb0b + 9afce7f commit 9420a48
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 1,184 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ install: changelog

.PHONY: virtualenv
virtualenv:
test -d $(VIRTUALENV_DIR) || virtualenv --no-site-packages --python=$(PYTHON) $(VIRTUALENV_DIR)
test -d $(VIRTUALENV_DIR) || virtualenv --python=$(PYTHON) $(VIRTUALENV_DIR)

.PHONY: requirements
requirements: virtualenv
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ Where ${DISTRO} refers to flavor name. See [docker-compose.yml](docker-compose.y
* Use [`st2chatops.env`](st2chatops.env) to store the settings. The example uses Slack; set appropriate environment variables for other Chat Services:
[Slack](https://github.com/slackhq/hubot-slack),
[Microsoft Teams](https://github.com/Microsoft/BotFramework-Hubot),
[HipChat](https://github.com/hipchat/hubot-hipchat),
[Cisco Spark](https://github.com/tonybaloney/hubot-spark),
[Flowdock](https://github.com/flowdock/hubot-flowdock),
[IRC](https://github.com/nandub/hubot-irc),
Expand Down
1,201 changes: 35 additions & 1,166 deletions npm-shrinkwrap.json

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "st2-hubot",
"version": "0.5.0",
"version": "0.6.0",
"st2_version": "3.3dev",
"private": true,
"author": "StackStorm <[email protected]>",
Expand All @@ -14,15 +14,14 @@
"hubot-diagnostics": "0.0.2",
"hubot-flowdock": "^0.7.8",
"hubot-help": "^0.2.2",
"hubot-hipchat": "git+https://github.com/StackStorm/hubot-hipchat.git#sonnyp-patch",
"hubot-irc": "^0.4.0",
"hubot-matteruser": "^5.2.0",
"hubot-redis-brain": "0.0.4",
"hubot-rocketchat": "^2.0.0",
"hubot-scripts": "^2.17.2",
"hubot-slack": "^4.5.5",
"hubot-spark": "git+https://github.com/tonybaloney/hubot-spark.git#c440504",
"hubot-stackstorm": "^0.10.2",
"hubot-stackstorm": "^0.11.0",
"hubot-xmpp": "^0.2.5"
},
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions packagingenv/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ RUN curl --silent --location https://rpm.nodesource.com/setup_10.x | bash -
{%- if version in ('centos8') %}

# Install development tools
yum -y module install nodejs:10
RUN yum -y module install nodejs:10

# Install python3 for gyp
RUN yum -y install python3

# Upgrade gyp to a python3 compatible version
RUN npm explore npm -g -- npm install node-gyp@latest
RUN npm install -g node-gyp@latest

{%- endif %}

Expand Down
6 changes: 5 additions & 1 deletion packagingenv/centos8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ RUN yum -y module install nodejs:10
RUN yum -y install python3

# Upgrade gyp to a python3 compatible version
RUN npm explore npm -g -- npm install node-gyp@latest
RUN npm install -g node-gyp@latest

# Install development tools
RUN yum -y install nodejs

COPY docker-entrypoint.sh /entrypoint.sh
ENTRYPOINT [ "/entrypoint.sh" ]
10 changes: 0 additions & 10 deletions st2chatops.env
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ export ST2_WEBUI_URL="${ST2_WEBUI_URL:-https://${ST2_HOSTNAME}}"
# Currently supported:
# - slack
# - botframework (Microsoft Teams)
# - hipchat
# - xmpp
# - flowdock
# - spark
Expand Down Expand Up @@ -89,15 +88,6 @@ export ST2_WEBUI_URL="${ST2_WEBUI_URL:-https://${ST2_HOSTNAME}}"
# hubot if they sideload your application manifest.
# export HUBOT_OFFICE365_TENANT_FILTER=''

# HipChat settings (https://github.com/hipchat/hubot-hipchat):
#
# export HUBOT_ADAPTER=hipchat
# export HUBOT_HIPCHAT_JID=CHANGE-ME-PLEASE
# export HUBOT_HIPCHAT_PASSWORD=CHANGE-ME-PLEASE
#
# Uncomment for HipChat Server:
# export HUBOT_HIPCHAT_XMPP_DOMAIN=btf.hipchat.com

# XMPP settings (https://github.com/markstory/hubot-xmpp):
#
# export HUBOT_ADAPTER=xmpp
Expand Down

0 comments on commit 9420a48

Please sign in to comment.