Skip to content

Commit

Permalink
fix(ci): correct tact.yml and format node.ts (#317)
Browse files Browse the repository at this point in the history
  • Loading branch information
anton-trunov authored May 2, 2024
1 parent bc086fb commit 6d9dbc1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/tact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,32 +61,32 @@ jobs:
run: |
npm install -g ./
- name: CLI Test: Compare Tact version from CLI flag `--version` against package.json
- name: CLI Test | Compare Tact version from CLI flag `--version` against package.json
if: runner.os != 'Windows'
run: |
if [ "$(tact --version)" != "$(jq -r '.version' < package.json)" ];
then false
fi
- name: CLI Test: Check single-contract compilation
- name: CLI Test | Check single-contract compilation
run: |
tact --check test/tact-cli/success.tact
tact --func test/tact-cli/success.tact
tact test/tact-cli/success.tact
- name: CLI Test: Check compilation via `--config`
- name: CLI Test | Check compilation via `--config`
run: |
# should output complete results
tact --config test/tact-cli/success.config.json
# should only run the syntax and type checking
tact --config test/tact-cli/success.config.json --check
- name: CLI Test: Check parsing of a non-existing CLI flag
- name: CLI Test | Check parsing of a non-existing CLI flag
if: runner.os != 'Windows'
run: |
! tact --nonexistentoption test/tact-cli/success.config.json
- name: CLI Test: tact executable return non-zero exit code if compilation fails
- name: CLI Test | tact executable return non-zero exit code if compilation fails
if: runner.os != 'Windows'
run: |
! tact --config test/tact-cli/fail.config.json
Expand Down
5 changes: 3 additions & 2 deletions src/node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,9 @@ export async function run(args: {
console.log("💼 Compiling project " + config.name + "...");
let cliConfig = { ...config };

if (args.additionalCliOptions !== undefined
&& args.additionalCliOptions.mode !== undefined
if (
args.additionalCliOptions !== undefined &&
args.additionalCliOptions.mode !== undefined
) {
cliConfig = { ...config, ...args.additionalCliOptions };
}
Expand Down

0 comments on commit 6d9dbc1

Please sign in to comment.