Skip to content

Commit ce43cf0

Browse files
committed
fix merge
1 parent 0c010be commit ce43cf0

5 files changed

Lines changed: 1319 additions & 2801 deletions

File tree

.cursorrules

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
1. Create a GitHub Action for SettleMint CLI
22
2. Use Node.js runtime (Node 20)
33
3. Accept command, token, and version inputs
4-
4. Install SettleMint CLI with specified version (default latest)
4+
4. Use npx for faster CLI execution with specified version (default latest)
55
5. Execute provided CLI commands
66
6. Handle errors and provide feedback
77
7. Configure TypeScript for proper type checking
@@ -12,3 +12,4 @@
1212
12. Add comprehensive test coverage for main functionality
1313
13. Configure Renovate to run `npm run package` after dependency updates
1414
14. Create comprehensive README documentation with examples and best practices
15+
15. Implement npm cache for faster package downloads

.worktrees/standalone

Lines changed: 0 additions & 1 deletion
This file was deleted.

__tests__/main.test.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ describe('action', () => {
113113
await main.run();
114114
expect(runMock).toHaveReturned();
115115

116+
<<<<<<< Updated upstream
116117
// Should use cached version
117118
expect(findMock).toHaveBeenCalledWith('settlemint-cli', 'latest');
118119
expect(addPathMock).toHaveBeenCalled();
@@ -124,6 +125,11 @@ describe('action', () => {
124125
expect(execMock).toHaveBeenCalledWith('settlemint', ['login', '-a']);
125126
expect(execMock).toHaveBeenCalledWith('settlemint', ['connect', '-a']);
126127
expect(execMock).toHaveBeenCalledWith('settlemint', ['status']);
128+
=======
129+
expect(execMock).toHaveBeenNthCalledWith(1, 'npm', ['install', '-g', '@settlemint/sdk-cli@latest']);
130+
expect(execMock).toHaveBeenNthCalledWith(2, 'settlemint', ['login', '-a']);
131+
expect(execMock).toHaveBeenNthCalledWith(3, 'settlemint', ['connect', '-a']);
132+
>>>>>>> Stashed changes
127133
});
128134

129135
it('does not auto-connect when using an application access token', async () => {

0 commit comments

Comments
 (0)