Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
510ce09
#13: working on install, local and list command from stellar env
malcommac Feb 5, 2023
490d7a1
#13: working on command runner
malcommac Feb 5, 2023
f9fc551
#13: Added StellarEnv to schemes to compile and assets in release
malcommac Feb 6, 2023
f7483dd
#13 Working on update of the environment
malcommac Feb 6, 2023
eca495a
#13: convert jsonRequest to sync command
malcommac Feb 12, 2023
5f5391e
#13: working on env installation
malcommac Feb 19, 2023
81ae84f
#13: Added rm+mv to stellar env installation
malcommac Feb 19, 2023
412f7ba
#13 removed async operations, added shortcuts for terminal commands
malcommac Feb 19, 2023
4487b27
#13: renaming classes
malcommac Feb 19, 2023
a9100ec
#13: added command forwarder to resolve and call the appropriate vers…
malcommac Feb 19, 2023
f41f2ec
#13: fixes
malcommac Feb 19, 2023
9aea85c
#13: some files reorganization
malcommac Feb 19, 2023
9b4b9fa
#13: some doc
malcommac Feb 19, 2023
7684cd4
Merge branch 'master' into feature/13-stellar-env
malcommac Feb 19, 2023
efa1703
#13: updated import for StellarCore
malcommac Feb 19, 2023
e361a27
#13: fixes
malcommac Feb 19, 2023
efc92a9
Merge branch 'master' into feature/13-stellar-env
malcommac Feb 21, 2023
ff64b1c
#13: Used @main and renamed StellarEnvCommands
malcommac Feb 26, 2023
a31f904
#13: Added StellarEnv Tests folder suite
malcommac Feb 26, 2023
4bab549
#13: Added support for smart file downloads using Swift (instead of c…
malcommac Feb 26, 2023
22dbdae
#13: Some cleanup on APIProvider
malcommac Feb 26, 2023
21d38cd
#13: Updating EnvInstaller
malcommac Feb 26, 2023
55438f5
#13: working on dependency injection, removed some classes
malcommac Feb 26, 2023
ac2262b
#13: Some refactoring
malcommac Feb 26, 2023
df2c162
#13: Some refinements
malcommac Feb 26, 2023
73a3f77
#13: Added Mock server for tests
malcommac Feb 26, 2023
b1b4c24
#13: working on test
malcommac Feb 26, 2023
ed51516
#13: various changes
malcommac Feb 26, 2023
d5fccdc
#13: working on installation by tag and version
malcommac Feb 27, 2023
cd793fc
#13: refactoring
malcommac Feb 27, 2023
516e8b3
#13: Commented some test code
malcommac Feb 27, 2023
1b10ae9
#13: Fix for CommandForwarder
malcommac Feb 27, 2023
6689a75
#13: Updated install.sh script to install stellarenv
malcommac Feb 27, 2023
1fa6495
#13: Cleanup
malcommac Feb 27, 2023
6297e96
#13: Fixed install.sh script
malcommac Feb 27, 2023
0e7dc72
#13: Added installation of CLI in install.sh
malcommac Feb 27, 2023
08ecdd2
#13: disabled mark as prerelease
malcommac Feb 27, 2023
c7401a6
Split install.sh into install.sh and install_private.sh
albertodebortoli Feb 28, 2023
b5215af
Fix typos
albertodebortoli Feb 28, 2023
4bfb3c7
Remove broken reference to StellarTests from StellarEnv scheme
albertodebortoli Feb 28, 2023
74fdd71
Update swift-tools-support-core to version already in .resolved
albertodebortoli Feb 28, 2023
f5132e7
Use .upToNextMajor for swift-tools-support-core as done for the other…
albertodebortoli Feb 28, 2023
7bf6316
Sort entries in Package.swift
albertodebortoli Feb 28, 2023
27999e5
Sort targets in Package.swift
albertodebortoli Feb 28, 2023
66cc186
Remove duplicate HintTemplateNames
albertodebortoli Feb 28, 2023
3a4732b
Add toolFolder to FileConstants
albertodebortoli Feb 28, 2023
5775bfc
Minor name consistency and sorting
albertodebortoli Feb 28, 2023
eaa6981
Improve FileManager's withTemporaryDirectory
albertodebortoli Mar 1, 2023
70ea5cb
Minor improvements in BundleUpdater
albertodebortoli Mar 4, 2023
7f2098c
Minor improvements in CLIInstaller
albertodebortoli Mar 4, 2023
20cdcd8
Minor improvements in EnvInstaller
albertodebortoli Mar 4, 2023
47667fa
Minor improvements in CommandResolver
albertodebortoli Mar 4, 2023
89da287
Minor improvements in ReleaseProvider
albertodebortoli Mar 4, 2023
fc771df
Minor improvements in VersionResolver
albertodebortoli Mar 4, 2023
e4b27e5
Minor improvements in URLManager
albertodebortoli Mar 4, 2023
8b8f0dd
Put RemoteRelease Codable conformance in extension
albertodebortoli Mar 4, 2023
8d652f8
Minor improvements in Shell
albertodebortoli Mar 4, 2023
e237dc6
Minor remaining improvements
albertodebortoli Mar 4, 2023
5470869
Fix binName constant
albertodebortoli Mar 4, 2023
1097f2e
Remove resources from StellarEnvTests to fix build warning
albertodebortoli Mar 4, 2023
98d6ca9
Correct GitHub Actions workflows
albertodebortoli Mar 4, 2023
696d0a9
Update run-tests workflow to run tests on any PR
albertodebortoli Mar 4, 2023
47f85ac
Fix uninstall.sh
albertodebortoli Mar 4, 2023
fe8fe0e
Move workflows back to macos-12
albertodebortoli Mar 5, 2023
33f6b08
Use @main in StellarEnvCommand to leverage Argument Parser
albertodebortoli Mar 5, 2023
87e0730
Revert back to macOS(.v12) in Package.swift
albertodebortoli Mar 5, 2023
a9b36c1
Revert "Use @main in StellarEnvCommand to leverage Argument Parser"
albertodebortoli Mar 5, 2023
fe82f78
Rename 3 methods in URLManager
albertodebortoli Mar 5, 2023
c42131c
Merge remote-tracking branch 'origin/master' into feature/13-stellar-env
Mar 5, 2023
9b73858
Fix retrieval of the GitHub token content
albertodebortoli Mar 6, 2023
b7b3991
Minor renaming
albertodebortoli Mar 6, 2023
88447ea
Minor renaming of a method
albertodebortoli Mar 6, 2023
c3e2f7b
Merge pull request #30 from StellarTools/feature/13-stellar-env-alberto
albertodebortoli Mar 6, 2023
2539859
#13: Fixed the name of the StellarCLI bin in FileConstants
malcommac Mar 11, 2023
403741a
#13: Fixed local versions list sorting
malcommac Mar 11, 2023
883aaec
#13: Removed whitespace in Package.swift
malcommac Mar 11, 2023
1dd2e26
#13: Added BundleService to bundle stellar-bin into a project
malcommac Mar 11, 2023
2c68fe0
#13: copy file should not remove (move) a file but create a copy
malcommac Mar 11, 2023
d90e694
#13: fixed a bug with deleteFolder in bundle installer
malcommac Mar 11, 2023
45ccd24
#13 Renamed CLI/Env/Bundle Installer* in Service*, renamed Bundle in …
malcommac Mar 11, 2023
dc90530
#13 Removed unused ShellOut import
malcommac Mar 11, 2023
6e5783f
#13: Renamed UpdaterService to be consistent with other protocols
malcommac Mar 11, 2023
976b753
#13: Minor log changes
malcommac Mar 11, 2023
5adaed8
Remove StellarEnv tests
albertodebortoli Mar 6, 2023
2072d87
Fix schemes
albertodebortoli Mar 11, 2023
303b499
Merge branch 'master' into feature/13-stellar-env
albertodebortoli Mar 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ jobs:
fail-fast: false
matrix:
macos: ['macos-12']
xcode: ['14.1.0']
command: ['build']
scheme: ['StellarCLI']
destination: ['platform=macOS']
xcode: ['14.2.0']
steps:
- name: Switch xcode to ${{ matrix.xcode }}
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
Expand All @@ -30,13 +27,7 @@ jobs:
- name: Show buildable schemes
working-directory: ./Stellar
run: xcodebuild -list
- name: Show eligible build destinations for ${{ matrix.scheme }}
working-directory: ./Stellar
run: xcodebuild -showdestinations -scheme ${{ matrix.scheme }}
- name: Run command ${{ matrix.command }} on ${{ matrix.scheme }} for destination ${{ matrix.destination }}
working-directory: ./Stellar
run: xcodebuild ${{ matrix.command }} -scheme ${{ matrix.scheme }} -destination "${{ matrix.destination }}"
- name: Archive using ${{ matrix.scheme }} for destination ${{ matrix.destination }}
- name: Build products for release
working-directory: ./Stellar
run: swift build -c release --arch arm64 --arch x86
- name: Copy Templates.bundle
Expand All @@ -45,6 +36,9 @@ jobs:
- name: Zip executable
working-directory: ./Stellar/.build/apple/Products/Release/
run: zip -r StellarCLI.zip StellarCLI Templates.bundle
- name: Zip StellarEnv Executable
working-directory: ./Stellar/.build/apple/Products/Release/
run: zip -r StellarEnv.zip StellarEnv
- name: Create Release
uses: actions/create-release@v1
id: create_release
Expand All @@ -53,9 +47,9 @@ jobs:
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
draft: false
prerelease: true
- name: Upload release asset
draft: false # just for testing
prerelease: false # just for testing
- name: Upload StellarCLI release asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
Expand All @@ -64,3 +58,12 @@ jobs:
asset_path: ./Stellar/.build/apple/Products/Release/StellarCLI.zip
asset_name: StellarCLI.zip
asset_content_type: application/zip
- name: Upload StellarEnv release asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./Stellar/.build/apple/Products/Release/StellarEnv.zip
asset_name: StellarEnv.zip
asset_content_type: application/zip
6 changes: 3 additions & 3 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- master
pull_request:
branches:
- master
- '**'

jobs:
build:
Expand All @@ -15,9 +15,9 @@ jobs:
fail-fast: false
matrix:
macos: ['macos-12']
xcode: ['14.1.0']
xcode: ['14.2.0']
command: ['test']
scheme: ['StellarCLI']
scheme: ['StellarCLI', 'StellarEnv']
destination: ['platform=macOS']
steps:
- name: Switch xcode to ${{ matrix.xcode }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,4 @@ iOSInjectionProject/

TestApp/.stellar/

.DS_Store
38 changes: 22 additions & 16 deletions Stellar/.swiftpm/xcode/xcshareddata/xcschemes/StellarCLI.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,25 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES"
onlyGenerateCoverageForSpecifiedTargets = "YES">
<CodeCoverageTargets>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "StellarCLI"
BuildableName = "StellarCLI"
BlueprintName = "StellarCLI"
ReferencedContainer = "container:">
</BuildableReference>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "StellarCLITests"
BuildableName = "StellarCLITests"
BlueprintName = "StellarCLITests"
ReferencedContainer = "container:">
</BuildableReference>
</CodeCoverageTargets>
<Testables>
<TestableReference
skipped = "NO">
Expand Down Expand Up @@ -59,35 +77,23 @@
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES"
viewDebuggingEnabled = "No">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "StellarCLI"
BuildableName = "StellarCLI"
BlueprintName = "StellarCLI"
ReferencedContainer = "container:">
</BuildableReference>
</BuildableProductRunnable>
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "StellarCLI"
BuildableName = "StellarCLI"
BlueprintName = "StellarCLI"
ReferencedContainer = "container:">
</BuildableReference>
</BuildableProductRunnable>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
Expand Down
67 changes: 67 additions & 0 deletions Stellar/.swiftpm/xcode/xcshareddata/xcschemes/StellarCore.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1420"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "StellarCore"
BuildableName = "StellarCore"
BlueprintName = "StellarCore"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "StellarCore"
BuildableName = "StellarCore"
BlueprintName = "StellarCore"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
125 changes: 125 additions & 0 deletions Stellar/.swiftpm/xcode/xcshareddata/xcschemes/StellarEnv.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1420"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "StellarEnv"
BuildableName = "StellarEnv"
BlueprintName = "StellarEnv"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This TestAction is now missing

Screenshot 2023-02-28 at 23 05 09

skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "StellarEnvTests"
BuildableName = "StellarEnvTests"
BlueprintName = "StellarEnvTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "StellarCoreTests"
BuildableName = "StellarCoreTests"
BlueprintName = "StellarCoreTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES"
viewDebuggingEnabled = "No">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "StellarEnv"
BuildableName = "StellarEnv"
BlueprintName = "StellarEnv"
ReferencedContainer = "container:">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "install"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "0.0.4"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "local"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "list"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "update"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "build"
isEnabled = "NO">
</CommandLineArgument>
</CommandLineArguments>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "StellarEnv"
BuildableName = "StellarEnv"
BlueprintName = "StellarEnv"
ReferencedContainer = "container:">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
22 changes: 20 additions & 2 deletions Stellar/Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading