Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/webpack-cli-6.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
alisonlhart authored Jan 13, 2025
2 parents 922a14f + a880852 commit 12fa455
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
4 changes: 1 addition & 3 deletions src/features/lightspeed/statusBar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,7 @@ export class LightspeedStatusBar {
}

public async lightSpeedStatusBarClickHandler() {
if (await this.lightspeedAuthenticatedUser.isAuthenticated()) {
vscode.commands.executeCommand(LightSpeedCommands.LIGHTSPEED_FEEDBACK);
} else {
if (!(await this.lightspeedAuthenticatedUser.isAuthenticated())) {
vscode.commands.executeCommand(
LightSpeedCommands.LIGHTSPEED_AUTH_REQUEST,
);
Expand Down
16 changes: 0 additions & 16 deletions tools/helper
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,6 @@ def cli() -> None:
)
logging.error(msg)
sys.exit(2)
if version_info[1] % 2 == 0:
# if the second segment of version_info is equal to 12 (December), increment the first segment (year) and set the second segment to 1 (January)
if version_info[1] == 12:
version_info[0] += 1
version_info[1] = 1
# otherwise, increment the second segment of version_info to point to the next month with an odd number
else:
version_info[1] += 1
else:
msg = (
f"Last git tag ({tag}) had a MINOR version number ({version_info[1]}) that was odd."
" Odd numbers are reserved for pre-release versions. Remove the tag and try again."
)
logging.error(msg)
sys.exit(2)
# determine the PATCH value, which is the time passed between last tag and last commit
try:
last_tag_timestamp = int(
subprocess.run(
Expand Down

0 comments on commit 12fa455

Please sign in to comment.