Skip to content

Commit

Permalink
Merge main into Lane
Browse files Browse the repository at this point in the history
  • Loading branch information
willemneal authored and gitbutler-client committed Nov 16, 2024
2 parents 027199a + 796d476 commit 3f091d9
Show file tree
Hide file tree
Showing 5 changed files with 167 additions and 6 deletions.
71 changes: 69 additions & 2 deletions .github/workflows/binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
target: aarch64-unknown-linux-gnu
- os: macos-14
target: aarch64-apple-darwin
- os: macos-12
- os: macos-14
target: x86_64-apple-darwin
- os: windows-latest
target: x86_64-pc-windows-msvc
Expand All @@ -44,41 +44,50 @@ jobs:
- uses: actions/checkout@v4
- run: rustup update
- run: rustup target add ${{ matrix.sys.target }}

- if: matrix.sys.target == 'aarch64-unknown-linux-gnu'
run: sudo apt-get update && sudo apt-get -y install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libudev-dev

- name: Setup vars
run: |
version="$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[] | select(.name == "stellar-cli") | .version')"
echo "VERSION=${version}" >> $GITHUB_ENV
echo "NAME=${{ matrix.crate.name }}-${version}-${{ matrix.sys.target }}" >> $GITHUB_ENV
- name: Package (release only)
if: github.event_name == 'release'
run: cargo package --no-verify --package ${{ matrix.crate.name }}

- name: Package Extract (release only)
if: github.event_name == 'release'
run: |
cd target/package
tar xvfz ${{ matrix.crate.name }}-$VERSION.crate
echo "BUILD_WORKING_DIR=target/package/${{ matrix.crate.name }}-$VERSION" >> $GITHUB_ENV
- name: Build
env:
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
working-directory: ${{ env.BUILD_WORKING_DIR }}
run: cargo build --target-dir="$GITHUB_WORKSPACE/target" --package ${{ matrix.crate.name }} --features opt --release --target ${{ matrix.sys.target }}

- name: Build provenance for attestation (release only)
if: github.event_name == 'release'
uses: actions/attest-build-provenance@v1
with:
subject-path: target/${{ matrix.sys.target }}/release/${{ matrix.crate.binary }}${{ matrix.sys.ext }}

- name: Compress
run: |
cd target/${{ matrix.sys.target }}/release
tar czvf $NAME.tar.gz ${{ matrix.crate.binary }}${{ matrix.sys.ext }}
- name: Upload to Artifacts
uses: actions/upload-artifact@v4
with:
name: ${{ env.NAME }}
name: ${{ env.NAME }}.tar.gz
path: 'target/${{ matrix.sys.target }}/release/${{ env.NAME }}.tar.gz'

- name: Upload to Release (release only)
if: github.event_name == 'release'
uses: actions/github-script@v7
Expand All @@ -92,3 +101,61 @@ jobs:
name: '${{ env.NAME }}.tar.gz',
data: fs.readFileSync('target/${{ matrix.sys.target }}/release/${{ env.NAME }}.tar.gz'),
});
installer:
needs: build
runs-on: windows-latest

steps:
- uses: actions/checkout@v4

- name: Setup vars
run: |
version="$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[] | select(.name == "stellar-cli") | .version')"
installer_basename="stellar-cli-installer-${version}-x86_64-pc-windows-msvc"
echo "VERSION=${version}" >> $GITHUB_ENV
echo "STELLAR_CLI_INSTALLER_BASENAME=${installer_basename}" >> $GITHUB_ENV
echo "STELLAR_CLI_INSTALLER=${installer_basename}.exe" >> $GITHUB_ENV
echo "ARTIFACT_NAME=stellar-cli-${version}-x86_64-pc-windows-msvc.tar.gz" >> $GITHUB_ENV
- name: Download Artifact
uses: actions/download-artifact@v4
with:
name: ${{ env.ARTIFACT_NAME }}

- name: Uncompress Artifact
run: tar xvf ${{ env.ARTIFACT_NAME }}

- name: Build Installer
shell: powershell
run: |
$Env:Path += ";C:\Users\$Env:UserName\AppData\Local\Programs\Inno Setup 6"
$Env:STELLAR_CLI_VERSION = "${{ env.VERSION }}"
ISCC.exe installer.iss
- name: Build provenance for attestation (release only)
if: github.event_name == 'release'
uses: actions/attest-build-provenance@v1
with:
subject-path: ${{ env.STELLAR_CLI_INSTALLER }}

- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: ${{ env.STELLAR_CLI_INSTALLER }}
path: Output/stellar-installer.exe

- name: Upload to Release (release only)
if: github.event_name == 'release'
uses: actions/github-script@v7
with:
script: |
const fs = require('fs');
await github.rest.repos.uploadReleaseAsset({
owner: context.repo.owner,
repo: context.repo.repo,
release_id: ${{ github.event.release.id }},
name: '${{ env.STELLAR_CLI_INSTALLER }}',
data: fs.readFileSync('Output/stellar-installer.exe'),
});
4 changes: 2 additions & 2 deletions FULL_HELP_DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -1749,9 +1749,9 @@ Set option for an account such as flags, inflation destination, signers, home do
* `--signer <SIGNER>` — Add, update, or remove a signer from an account
* `--signer-weight <SIGNER_WEIGHT>` — Signer weight is a number from 0-255 (inclusive). The signer is deleted if the weight is 0
* `--set-required` — When enabled, an issuer must approve an account before that account can hold its asset. https://developers.stellar.org/docs/tokens/control-asset-access#authorization-required-0x1
* `--set-revocable` — When enabled, an issuer can revoke an existing trustlines authorization, thereby freezing the asset held by an account. https://developers.stellar.org/docs/tokens/control-asset-access#authorization-revocable-0x2
* `--set-revocable` — When enabled, an issuer can revoke an existing trustline's authorization, thereby freezing the asset held by an account. https://developers.stellar.org/docs/tokens/control-asset-access#authorization-revocable-0x2
* `--set-clawback-enabled` — Enables the issuing account to take back (burning) all of the asset. https://developers.stellar.org/docs/tokens/control-asset-access#clawback-enabled-0x8
* `--set-immutable` — With this setting, none of the other authorization flags (`AUTH_REQUIRED_FLAG`, `AUTH_REVOCABLE_FLAG`) can be set, and the issuing account cant be merged. https://developers.stellar.org/docs/tokens/control-asset-access#authorization-immutable-0x4
* `--set-immutable` — With this setting, none of the other authorization flags (`AUTH_REQUIRED_FLAG`, `AUTH_REVOCABLE_FLAG`) can be set, and the issuing account can't be merged. https://developers.stellar.org/docs/tokens/control-asset-access#authorization-immutable-0x4
* `--clear-required`
* `--clear-revocable`
* `--clear-immutable`
Expand Down
4 changes: 2 additions & 2 deletions cmd/soroban-cli/src/commands/tx/new/set_options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ pub struct Cmd {
/// https://developers.stellar.org/docs/tokens/control-asset-access#authorization-required-0x1
pub set_required: bool,
#[arg(long, conflicts_with = "clear_revocable")]
/// When enabled, an issuer can revoke an existing trustlines authorization, thereby freezing the asset held by an account.
/// When enabled, an issuer can revoke an existing trustline's authorization, thereby freezing the asset held by an account.
/// https://developers.stellar.org/docs/tokens/control-asset-access#authorization-revocable-0x2
pub set_revocable: bool,
#[arg(long, conflicts_with = "clear_clawback_enabled")]
/// Enables the issuing account to take back (burning) all of the asset.
/// https://developers.stellar.org/docs/tokens/control-asset-access#clawback-enabled-0x8
pub set_clawback_enabled: bool,
#[arg(long, conflicts_with = "clear_immutable")]
/// With this setting, none of the other authorization flags (`AUTH_REQUIRED_FLAG`, `AUTH_REVOCABLE_FLAG`) can be set, and the issuing account cant be merged.
/// With this setting, none of the other authorization flags (`AUTH_REQUIRED_FLAG`, `AUTH_REVOCABLE_FLAG`) can be set, and the issuing account can't be merged.
/// https://developers.stellar.org/docs/tokens/control-asset-access#authorization-immutable-0x4
pub set_immutable: bool,
#[arg(long)]
Expand Down
94 changes: 94 additions & 0 deletions installer.iss
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
#define STELLAR_CLI_VERSION GetEnv("STELLAR_CLI_VERSION")
#define STELLAR_CLI_INSTALLER GetEnv("STELLAR_CLI_INSTALLER")

[Setup]
AppName=Stellar CLI
AppVersion={#STELLAR_CLI_VERSION}
DefaultDirName={commonpf}\Stellar CLI
DefaultGroupName=Stellar CLI
OutputBaseFilename=stellar-installer
PrivilegesRequired=admin
LicenseFile=LICENSE
UninstallDisplayIcon={app}\stellar.ico
Compression=lzma
SolidCompression=yes
ChangesEnvironment=yes

[Files]
Source: "stellar.exe"; DestDir: "{app}"
Source: "stellar.ico"; DestDir: "{app}"
Source: "LICENSE"; DestDir: "{app}"; Flags: ignoreversion

[Icons]
; Windows optimizes start menu, and removes the uninstall entry. Unless we
; specify it twice. 🫠
Name: "{group}\Uninstall Stellar CLI"; Filename: "{uninstallexe}"
Name: "{group}\Uninstall Stellar CLI"; Filename: "{uninstallexe}"
Name: "{group}\Stellar Developer Docs"; Filename: "https://stellar.org/docs"

[Code]
const EnvironmentKey = 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment';
procedure EnvAddPath(Path: string);
var
Paths: string;
begin
{ Retrieve current path (use empty string if entry not exists) }
if not RegQueryStringValue(HKEY_LOCAL_MACHINE, EnvironmentKey, 'Path', Paths)
then Paths := '';
{ Skip if string already found in path }
if Pos(';' + Uppercase(Path) + ';', ';' + Uppercase(Paths) + ';') > 0 then exit;
{ App string to the end of the path variable }
Paths := Paths + ';'+ Path +';'
{ Overwrite (or create if missing) path environment variable }
if RegWriteStringValue(HKEY_LOCAL_MACHINE, EnvironmentKey, 'Path', Paths)
then Log(Format('The [%s] added to PATH: [%s]', [Path, Paths]))
else Log(Format('Error while adding the [%s] to PATH: [%s]', [Path, Paths]));
end;
procedure EnvRemovePath(Path: string);
var
Paths: string;
P: Integer;
begin
{ Skip if registry entry not exists }
if not RegQueryStringValue(HKEY_LOCAL_MACHINE, EnvironmentKey, 'Path', Paths) then
exit;
{ Skip if string not found in path }
P := Pos(';' + Uppercase(Path) + ';', ';' + Uppercase(Paths) + ';');
if P = 0 then exit;
{ Update path variable }
Delete(Paths, P - 1, Length(Path) + 1);
{ Overwrite path environment variable }
if RegWriteStringValue(HKEY_LOCAL_MACHINE, EnvironmentKey, 'Path', Paths)
then Log(Format('The [%s] removed from PATH: [%s]', [Path, Paths]))
else Log(Format('Error while removing the [%s] from PATH: [%s]', [Path, Paths]));
end;
procedure CurStepChanged(CurStep: TSetupStep);
begin
if CurStep = ssPostInstall
then EnvAddPath(ExpandConstant('{app}'));
end;
procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
begin
if CurUninstallStep = usPostUninstall
then EnvRemovePath(ExpandConstant('{app}'));
end;
[UninstallDelete]
; Remove the Start Menu group
Type: filesandordirs; Name: "{group}"

; Remove installed files and directory
Type: files; Name: "{app}\stellar.exe"
Type: files; Name: "{uninstallexe}"
Type: files; Name: "{app}\stellar.ico"
Type: dirifempty; Name: "{app}"
Binary file added stellar.ico
Binary file not shown.

0 comments on commit 3f091d9

Please sign in to comment.