Skip to content

Commit

Permalink
ci: fix the main branch publish logic
Browse files Browse the repository at this point in the history
  • Loading branch information
genisd committed Oct 31, 2023
1 parent 020aa3c commit e1a2c35
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ local testJob = util.ghJob(
runsOn=['ubuntu-latest'], // it's public fork. don't use private runners for public fork
);

util.workflowJavascriptPackage(testJob=testJob)
util.workflowJavascriptPackage(testJob=testJob, branch='master')
2 changes: 1 addition & 1 deletion .github/jsonnet/GIT_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
afbecf4e8ac7ba526d30b74f71f29f0f287074b1
966d63a11993bc5df4d6538b678782c28fc2aabb
4 changes: 2 additions & 2 deletions .github/jsonnet/complete-workflows.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@param {boolean} checkVersionBump - Whether to assert if the version was bumped (recommended)
@param {ghJob} testJob - a job to be ran during PR to assert tests. can be an array of jobs
*/
workflowJavascriptPackage(repositories=['gynzy'], isPublicFork=true, checkVersionBump=true, testJob=null)::
workflowJavascriptPackage(repositories=['gynzy'], isPublicFork=true, checkVersionBump=true, testJob=null, branch='main')::
local runsOn = (if isPublicFork then 'ubuntu-latest' else null);

$.pipeline(
Expand All @@ -17,7 +17,7 @@
[
$.yarnPublishJob(repositories=repositories, runsOn=runsOn),
],
event={ push: { branches: ['${{ github.event.pull_request.base.repo.default_branch }}'] } },
event={ push: { branches: [ branch ] } },
) +
$.pipeline(
'pr',
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@
"on":
"push":
"branches":
- "${{ github.event.pull_request.base.repo.default_branch }}"
- "master"
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gynzy/ember-redux",
"version": "6.0.4",
"version": "6.0.3",
"description": "ember-cli addon that provides simple redux bindings for ember.js",
"scripts": {
"build": "ember build",
Expand Down

0 comments on commit e1a2c35

Please sign in to comment.