diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index b66f270..4acf315 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -31,7 +31,8 @@ jobs: self_contained: "--self-contained" framework: net6.0 nt_file: nexttrace_darwin_amd64 - nt_fn: nexttrace + nt_fn: OpenTrace.app/Contents/MacOS/nexttrace + pack_target: OpenTrace.app steps: - name: Checkout @@ -67,7 +68,7 @@ jobs: cd ${{ matrix.artifact_path }} mv ./nexttrace_* ./${{ matrix.nt_fn }} chmod +x ./${{ matrix.nt_fn }} - tar -cvzf ../../../../../${{ matrix.runtime }}.tar.gz . + tar -cvzf ${{ github.workspace }}/${{ matrix.runtime }}.tar.gz ${{ matrix.pack_target == '' && '.' || matrix.pack_target }} - name: Edit release for ${{ matrix.runtime }} uses: svenstaro/upload-release-action@v2 @@ -75,4 +76,4 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ matrix.runtime }}.tar.gz asset_name: ${{ matrix.runtime }}.tar.gz - tag: ${{ github.ref }} \ No newline at end of file + tag: ${{ github.ref }} diff --git a/NextTraceWrapper.cs b/NextTraceWrapper.cs index 7de7c69..b4d160e 100644 --- a/NextTraceWrapper.cs +++ b/NextTraceWrapper.cs @@ -103,7 +103,12 @@ public NextTraceWrapper() break; } } - if(nexttracePath != null) break; + if (nexttracePath != null) break; + else if (File.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "OpenTrace.app/Contents/MacOS", otherBinaryName))) + { + nexttracePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "OpenTrace.app/Contents/MacOS", otherBinaryName); + break; + } } } }