Skip to content

Commit

Permalink
# This is a combination of 5 commits.
Browse files Browse the repository at this point in the history
# This is the 1st commit message:

Set up ESLint for parser service

# The commit message Seneca-CDOT#2 will be skipped:

# Fix typo in posts_url with docker-build-and-push.yml

# The commit message Seneca-CDOT#3 will be skipped:

# 2.8.2

# The commit message Seneca-CDOT#4 will be skipped:

# [satellite]: use Satellite from npm registry (Seneca-CDOT#3220)
#
# * Use Satellite from npm registry

# The commit message Seneca-CDOT#5 will be skipped:

# Set up buildx before running containers in e2e tests for cachine
  • Loading branch information
Anatoliy Serputov committed Mar 17, 2022
1 parent 77e8433 commit 98ab290
Show file tree
Hide file tree
Showing 16 changed files with 2,159 additions and 1,946 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/continuous-delivery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ jobs:
uses: Seneca-CDOT/telescope/.github/workflows/deploy-webhook.yml@master
with:
deploy_tag: staging
webhook_url: https://dev.telescope.cdot.systems/deploy
webhook_url: https://dev.telescope.cdot.systems:4000
secrets:
webhook_token: ${{ secrets.STAGING_WEBHOOK_SECRET }}
2 changes: 1 addition & 1 deletion .github/workflows/docker-build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
API_URL=${{ inputs.api_url }}
IMAGE_URL=${{ inputs.image_url }}
SSO_URL=${{ inputs.sso_url }}
POSTS_URL=${{ inputs.posts.url }}
POSTS_URL=${{ inputs.posts_url }}
SEARCH_URL=${{ inputs.search_url }}
FEED_DISCOVERY_URL=${{ inputs.feed_discovery_url }}
STATUS_URL=${{ inputs.status_url }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/e2e-tests-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
- uses: docker/setup-buildx-action@v1
- uses: microsoft/playwright-github-action@v1
- name: Start microservices and run e2e tests
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ jobs:
prerelease: false

deploy-production:
name: Staging Deploy
name: Production Deploy
needs: [docker-production, release]
uses: Seneca-CDOT/telescope/.github/workflows/deploy-webhook.yml@master
with:
deploy_tag: production
webhook_url: https://telescope.cdot.systems/deploy
webhook_url: https://telescope.cdot.systems:4000
secrets:
webhook_token: ${{ secrets.PRODUCTION_WEBHOOK_SECRET }}
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ tag-version-prefix=""
# Don't use ^ when adding packages, prefix with nothing, see:
# https://pnpm.io/npmrc#save-prefix
save-prefix=""

link-workspace-packages=false
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@senecacdot/telescope",
"private": true,
"version": "2.8.1",
"version": "2.8.2",
"description": "A tool for tracking blogs in orbit around Seneca's open source involvement",
"bin": {
"html-elements": "tools/html-elements.js"
Expand Down

0 comments on commit 98ab290

Please sign in to comment.