Skip to content

Commit

Permalink
Merge branch 'master' into release/v1.0.0-2023.3
Browse files Browse the repository at this point in the history
  • Loading branch information
ellizio committed Apr 5, 2024
2 parents ece3faa + 3106352 commit edeec81
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- uses: actions/upload-artifact@v3
if: github.ref_name == 'master' || github.ref_name == 'dev'
with:
name: $odata-cli-ui.${{ steps.fix_branch_name.outputs.value }}-${{ github.run_number }}
name: odata-cli-ui.${{ steps.fix_branch_name.outputs.value }}-${{ github.run_number }}
path: output
Test:
runs-on: ubuntu-latest
Expand Down
21 changes: 0 additions & 21 deletions .github/workflows/Deploy.yml

This file was deleted.

32 changes: 32 additions & 0 deletions .github/workflows/Release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Release

on:
push:
tags:
- 'v*.*.*-*.*'

jobs:
Release:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- run: ./gradlew :rdgen
- run: ./gradlew :buildPlugin -PBuildConfiguration=Release
- run: ./gradlew :signPlugin -PBuildConfiguration=Release
env:
CERTIFICATE_CHAIN: ${{ secrets.CERTIFICATE_CHAIN }}
PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
PRIVATE_KEY_PASSWORD: ${{ secrets.PRIVATE_KEY_PASSWORD }}
- uses: mad9000/actions-find-and-replace-string@5
id: fix_branch_name
with:
source: ${{ github.ref_name }}
find: 'release/'
replace: ''
- uses: actions/upload-artifact@v3
if: always()
with:
name: odata-cli-ui.${{ steps.fix_branch_name.outputs.value }}
path: output
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ TODO

## Additional References

- [Changelog](https://github.com/ellizio/rider--plugin--odata-cli-ui/blob/master/CHANGELOG.md)
- [OData CLI](https://learn.microsoft.com/en-us/odata/odatacli/getting-started)
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class BatchCommandLineExecutor(
private val batchCommandLine: BatchCommandLine,
private val consoleView: ConsoleView) {

private val newLine = System.lineSeparator() + System.lineSeparator();
private val newLine = System.lineSeparator() + System.lineSeparator()

fun execute() {
val listener = object : ProcessAdapter() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ class CommandLineExecutor(
private val commandLine: GeneralCommandLine,
private val consoleView: ConsoleView) {

private val newLine = System.lineSeparator() + System.lineSeparator();
private val newLine = System.lineSeparator() + System.lineSeparator()

fun execute(): Boolean {
var hasError = false;
var hasError = false

val listener = object : ProcessAdapter() {
override fun onTextAvailable(event: ProcessEvent, outputType: Key<*>) {
Expand All @@ -30,7 +30,7 @@ class CommandLineExecutor(

override fun processTerminated(event: ProcessEvent) {
if (event.exitCode != 0)
hasError = true;
hasError = true

super.processTerminated(event)
}
Expand Down

0 comments on commit edeec81

Please sign in to comment.