diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7e2dc5..61dd588 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,6 +8,7 @@ on: jobs: build: + name: Build Dynamo and TuneUp runs-on: windows-latest steps: - name: Checkout TuneUp Repo @@ -30,9 +31,7 @@ jobs: - name: Setup msbuild uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0 - name: Install dependencies for Dynamo solution - run: | - nuget restore ${{ github.workspace }}\Dynamo\src\Dynamo.All.sln - nuget restore $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln + run: nuget restore ${{ github.workspace }}\Dynamo\src\Dynamo.All.sln - name: Install dependencies for TuneUp solution run: nuget restore ${{ github.workspace }}\TuneUp\TuneUp.sln - name: Build Dynamo solution diff --git a/.github/workflows/trigger_jenkins.yaml b/.github/workflows/trigger_jenkins.yaml deleted file mode 100644 index 40e6754..0000000 --- a/.github/workflows/trigger_jenkins.yaml +++ /dev/null @@ -1,19 +0,0 @@ -name: Trigger Jenkins CI -on: - - push - - pull_request -jobs: -# This workflow contains a single job called "trigger_jenkins" - trigger_jenkins: - # The type of runner that the job will run on - #runs-on: jenkins-trigger - runs-on: self-hosted - env: - REPO_NAME: ${{ github.event.repository.name }} - ORG_NAME: ${{ github.event.organization.login }} - JENKINS_ROOT: ${{ secrets.JENKINS_CONTROLLER_URL }}job/${{ secrets.JENKINS_TRIGGER_ROOT_FOLDER }}/job/${{ secrets.JENKINS_TRIGGER_ORG_FOLDER }}/job/ - steps: - - name: trigger single Job - run: > - curl -X POST -u "${{ secrets.JENKINS_TRIGGER_USER }}:${{ secrets.JENKINS_TRIGGER_TOKEN }}" - ${{ env.JENKINS_ROOT}}/${{ env.ORG_NAME }}/job/${{ env.REPO_NAME }}/build\?delay=\0 diff --git a/.github/workflows/trigger_l10n_jenkins.yml b/.github/workflows/trigger_l10n_jenkins.yml new file mode 100644 index 0000000..eb0bd0d --- /dev/null +++ b/.github/workflows/trigger_l10n_jenkins.yml @@ -0,0 +1,21 @@ +name: Trigger L10N Jenkins Job + +on: + push: + branches: + - master + +permissions: + contents: read + +jobs: + trigger_jenkins: + name: Trigger Jenkins Job + runs-on: self-hosted + steps: + - name: Trigger Job + shell: bash + run: | + AUTH="${{ secrets.L10N_JENKINS_TRIGGER_USER }}:${{ secrets.L10N_JENKINS_TRIGGER_TOKEN }}" + JENKINS_URL="${{ secrets.L10N_JENKINS_CONTROLLER_URL }}/job/${{ secrets.L10N_JENKINS_TRIGGER_ROOT_FOLDER }}/job/${{ secrets.L10N_JENKINS_TRIGGER_ORG_FOLDER }}/job/${{ github.repository_owner }}/job/${{ github.event.repository.name }}/job/${{ secrets.L10N_JENKINS_BRANCH }}/buildWithParameters?delay=0" + curl -f -sS -X POST -u "$AUTH" "$JENKINS_URL" diff --git a/README.md b/README.md index 855d79c..6a842de 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Please check out known issues before trying to setup testing. - Download DynamoCoreRuntime 3.0.0 (or higher) from [dynamobuilds.com](https://dynamobuilds.com/). Alternatively, you can build Dynamo from Dynamo repository and use the bin folder equivalently. - Copy all contents of the DynamoCoreRuntime to `TuneUp\TuneUpTests\bin\Debug\`. If you are building Dynamo locally, copy all contents of Dynamo from `Dynamo/bin/AnyCPU/Debug` to `TuneUp\TuneUpTests\bin\Debug\` - Copy `TuneUp_ViewExtensionDefinition.xml` from `TuneUp\TuneUp\manifests\` to `TuneUp\TuneUpTests\bin\Debug\viewExtensions\` -- Open the copied `TuneUp_ViewExtensionDefinition.xml` and change the assemply path to `..\TuneUp.dll` +- Open the copied `TuneUp_ViewExtensionDefinition.xml` and change the assembly path to `..\TuneUp.dll` - Remove `TuneUp` from your Dynamo packages folder if you have it installed from package manager (otherwise `TuneUp.dll` will get loaded twice). This won't work well. - Launch DynamoSandbox.exe, then click `View-> Open Tune Up` and use while a graph runs. @@ -58,10 +58,11 @@ Please check out known issues before trying to setup testing. - Click the target test to run or run them all. ### How to publish a new version -We currently can't use the release PR option when making releases on mirrored repositories. There is a propsed follow-up improvment filed that would allow CILibrary to create a PR against the public repository instead (DYN-8724). But until that is done, our release process will be: + +We currently can't use the release PR option when making releases on mirrored repositories. There is a proposed follow-up improvement filed that would allow CILibrary to create a PR against the public repository instead (DYN-8724). But until that is done, our release process will be: - Create a release branch on the internal repository - Build the branch to publish -- Manually create a PR on the public repository with the changes introduced by the release branch (the updated version number in the pipeline file). +- Manually create a PR on the public repository with the changes introduced by the release branch (the updated version number in the pipeline file). - Review and merge this PR - Delete the release branch on the internal repository