Skip to content

Commit ca75c57

Browse files
committed
build: setup to build next versions, prevented pslb built as it is not working on this branch and a fix: reverted incorrectly mered conflicts to mark-label.test.js
1 parent 9051dc2 commit ca75c57

File tree

6 files changed

+258
-165
lines changed

6 files changed

+258
-165
lines changed

.circleci/config.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ jobs:
5252
- save_cache: *save_cache
5353
- run: scripts/build release --next --skipForcePublish --token $NPM_TOKEN
5454

55+
#Beta build is actually not acting as we'd like it to act: it is not creating @beta versions, but "latest" versions instead.
56+
#That happens because build-helper only permits 2 options: "next" or nothing, which actually means "latest"...
57+
#One thing we could try would be to upgrade build-helper
5558
# beta_build:
5659
# <<: *defaults
5760
# steps:
@@ -109,6 +112,7 @@ workflows:
109112
branches:
110113
only:
111114
- develop
115+
- feat/slate-editor-updates
112116
build_master:
113117
jobs:
114118
- release_build:
@@ -122,7 +126,7 @@ workflows:
122126
# filters:
123127
# branches:
124128
# only:
125-
# - beta
129+
# - feat/slate-editor-updates
126130
# nightly:
127131
# triggers:
128132
# - schedule:

packages/demo/CHANGELOG.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1414,4 +1414,4 @@
14141414
"isTagged": true,
14151415
"tag": "@pie-lib/demo@7.2.0"
14161416
}
1417-
]
1417+
]

packages/pie-toolbox/CHANGELOG.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
"isTagged": true,
1515
"tag": "@pie-lib/pie-toolbox@1.4.0"
1616
}
17-
]
17+
]

packages/pie-toolbox/src/code/graphing/__tests__/mark-label.test.jsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,19 @@ describe('coordinates', () => {
5959
});
6060
};
6161
assertCoordinates({ x: 0, y: 0 }, { width: 0, height: 0 }, 'top-left', {
62-
left: `${-10 / 16}rem`,
63-
top: `${-10 / 16}rem`,
62+
left: `${-10 / 16}em`,
63+
top: `${-10 / 16}em`,
6464
});
6565
assertCoordinates({ x: 0, y: 0 }, { width: 0, height: 0 }, 'bottom-left', {
66-
left: `${-10 / 16}rem`,
67-
top: `${10 / 16}rem`,
66+
left: `${-10 / 16}em`,
67+
top: `${10 / 16}em`,
6868
});
6969
assertCoordinates({ x: 0, y: 0 }, { width: 0, height: 0 }, 'top-right', {
70-
left: `${10 / 16}rem`,
71-
top: `${-10 / 16}rem`,
70+
left: `${10 / 16}em`,
71+
top: `${-10 / 16}em`,
7272
});
7373
assertCoordinates({ x: 0, y: 0 }, { width: 0, height: 0 }, 'bottom-right', {
74-
left: `${10/16}rem`,
75-
top: `${10/16}rem`,
74+
left: `${10 / 16}em`,
75+
top: `${10 / 16}em`,
7676
});
7777
});

scripts/build

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ class LibCommands extends Commands {
2222
]);
2323
}
2424

25-
// TODO currently this occupies a lot of space and there's no way circle ci can handle it (I've experimented but without success)
26-
// so I'll publish manually temporarily until we find a solution
25+
// TODO pslb builds are not working with slate, this needs to be fixed PD-3379
26+
// we also need to make sure this will create beta versions
2727
sharedBuild() {
28-
if (args.next) {
29-
return Promise.resolve();
30-
} else {
31-
return this.runCmd(
32-
`yarn pslb --config pslb/pslb.config.js --publishLibs --token ${args.token} --cleanLibs --logLevel debug`
33-
);
34-
}
28+
// if (args.next) {
29+
// return Promise.resolve();
30+
// } else {
31+
// return this.runCmd(
32+
// `yarn pslb --config pslb/pslb.config.js --publishLibs --token ${args.token} --cleanLibs --logLevel debug`
33+
// );
34+
// }
3535
}
3636

3737
build() {

0 commit comments

Comments
 (0)