Skip to content

Commit

Permalink
Merge branch 'main' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
pnwpedro committed Mar 21, 2024
2 parents a22ce91 + 4240c08 commit 4b13d36
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 19 deletions.
34 changes: 16 additions & 18 deletions concourse/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ resources:
source:
uri: [email protected]:fauna/fauna-js.git
branch: main
tag_filter: v*
# tag_filter: v*
private_key: ((github-ssh-key))

- name: beta.git
Expand All @@ -28,7 +28,7 @@ resources:
source:
uri: [email protected]:fauna/fauna-js.git
branch: beta
tag_filter: v*
# tag_filter: v*
private_key: ((github-ssh-key))

- name: testtools-repo
Expand Down Expand Up @@ -218,7 +218,7 @@ jobs:

- task: query-limits-tests
privileged: true
file: main.git/concourse/tasks/query-limits-tests.yml
file: beta.git/concourse/tasks/query-limits-tests.yml
input_mapping: {repo.git: beta.git, testtools-repo: testtools-repo}
params:
QUERY_LIMITS_DB: limited
Expand All @@ -238,23 +238,21 @@ jobs:
plan:
- get: beta.git
passed:
- test-beta

- task: integration-tests
file: main.git/concourse/tasks/integration-tests.yml
input_mapping: {repo.git: beta.git}
privileged: true
on_success:
put: notify
params:
text: "fauna-js driver release passed integration tests"
on_failure:
put: notify
params:
text: fauna-js driver release failed integration tests
# - task: integration-tests
# file: beta.git/concourse/tasks/integration-tests.yml
# input_mapping: {repo.git: beta.git}
# privileged: true
# on_success:
# put: notify
# params:
# text: "fauna-js driver release passed integration tests"
# on_failure:
# put: notify
# params:
# text: fauna-js driver release failed integration tests

- task: publish
file: main.git/concourse/tasks/npm-publish.yml
file: beta.git/concourse/tasks/npm-publish.yml
input_mapping: {repo.git: beta.git}
params:
NPM_TOKEN: ((npm_token))
Expand Down
2 changes: 1 addition & 1 deletion concourse/scripts/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -eou pipefail

cd ./fauna-js-repository
cd ./repo.git

PACKAGE_VERSION=$(node -p -e "require('./package.json').version")
NPM_LATEST_VERSION=$(npm view fauna version)
Expand Down

0 comments on commit 4b13d36

Please sign in to comment.