Skip to content

Commit

Permalink
Merge pull request #95 from x64dbg/bugfixes
Browse files Browse the repository at this point in the history
Fix plugin creation and project generation
  • Loading branch information
mrexodia authored Mar 16, 2024
2 parents 62ae879 + b3c173e commit 8127283
Show file tree
Hide file tree
Showing 20 changed files with 437 additions and 209 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# cmkr
/**/CMakeLists.txt linguist-generated
/**/cmkr.cmake linguist-vendored
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.3
uses: microsoft/setup-msbuild@v2
- name: Build
run: |
cmake . -B build -DCMAKE_BUILD_TYPE=Release -A ${{ matrix.platform.build }}
Expand All @@ -35,7 +35,7 @@ jobs:
Dotx64DbgTests.exe
popd
- name: Upload artifacts (CI)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dotx64Dbg-${{ runner.os }}-${{ matrix.platform.arch }}
path: bin/
Expand All @@ -46,7 +46,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Fetch artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: artifacts
- name: Display structure of downloaded files
Expand All @@ -72,22 +72,22 @@ jobs:
find ./package -type f -name '*.exp' -delete
find ./package -type f -name '*.ilk' -delete
- name: Upload package (CI)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dotx64dbg
path: package
if-no-files-found: error
- name: Compress package
uses: papeloto/action-zip@v1
uses: papeloto/action-zip@1379ea20d4c5705669ba81fd626dd01b1c738f26 # v1.2
if: ${{ startsWith(github.ref, 'refs/tags/') }}
with:
files: package/
dest: ${{ github.event.repository.name }}-${{ github.ref_name }}.zip
- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@d99959edae48b5ffffd7b00da66dcdb0a33a52ee # v2.0.2
if: ${{ startsWith(github.ref, 'refs/tags/') }}
with:
prerelease: ${{ !startsWith(github.ref, 'refs/tags/v') || contains(github.ref, '-pre') }}
files: ${{ github.event.repository.name }}-${{ github.ref_name }}.zip
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
168 changes: 41 additions & 127 deletions CMakeLists.txt

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

Loading

0 comments on commit 8127283

Please sign in to comment.