Skip to content

Commit

Permalink
Merge pull request #50 from FlameOfIgnis/dev-ata
Browse files Browse the repository at this point in the history
Change build pipeline to release with libraries correctly named
  • Loading branch information
ignis-sec authored May 17, 2021
2 parents 6cd9643 + 0996881 commit 9b20e19
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .github/action_helpers/actions_windows_libboost.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ cp $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\x64\Release\lib\boost_program_opti

cp $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\x64\Release\lib\boost_python$a$b.dll $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\lib\libboost_python$a$b-vc142-mt-x64-1_76.dll;
cp $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\x64\Release\lib\boost_python$a$b.lib $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\lib\libboost_python$a$b-vc142-mt-x64-1_76.lib;

cp $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\x64\Release\lib\boost_python$a$b.dll $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\lib\boost_python$a$b.dll;

17 changes: 8 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ env:
# Environment variables for building strategy

GITHUB_ACTION_WIN_PROJECT: D:\a\MarkovPasswords

# Solution path
SOLUTION_FILE_PATH: ./

Expand Down Expand Up @@ -135,7 +134,7 @@ jobs:
run: make PYTHON_VERSION=${{ matrix.python-version }} all

- name: Zip built files # This would actually build your project, using zip for an example artifact
run: zip --junk-paths linux-python${{ matrix.python-version }}.so.zip Markopy/src/CLI/markopy_cli.py bin/markopy.so /usr/local/lib/libboost_python38.so.1.76.0 /usr/local/lib/libboost_python38.so;
run: zip --junk-paths markopy-linux-py${{ matrix.python-version }}.so.zip Markopy/src/CLI/markopy_cli.py bin/markopy.so /usr/local/lib/libboost_python*.so.1.76.0

- name: Upload Release Asset
id: upload-release-asset
Expand All @@ -144,8 +143,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.reversion.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: ./linux-python${{ matrix.python-version }}.so.zip
asset_name: linux-python${{ matrix.python-version }}.so.zip
asset_path: ./markopy-linux-py${{ matrix.python-version }}.so.zip
asset_name: markopy-linux-py${{ matrix.python-version }}.so.zip
asset_content_type: application/zip

MSBuild:
Expand Down Expand Up @@ -173,7 +172,7 @@ jobs:
id: cache-boost
with:
path: ${{env.GITHUB_ACTION_WIN_PROJECT}}\boost
key: 'windows-libboost-1.76-${{ matrix.python-version }}'
key: 'windows-boost-1.76-${{ matrix.python-version }}'

- name: Build Boost
id: boost
Expand Down Expand Up @@ -206,18 +205,18 @@ jobs:
- name: Zip built files # This would actually build your project, using zip for an example artifact
run:
powershell "Compress-Archive Markopy/src/CLI/markopy_cli.py,x64/Release/markopy.pyd,${{env.GITHUB_ACTION_WIN_PROJECT}}\boost\stage\lib\libboost_python* windows-python${{ matrix.python-version }}.pyd.zip"
powershell "Compress-Archive Markopy/src/CLI/markopy_cli.py,x64/Release/markopy.pyd,${{env.GITHUB_ACTION_WIN_PROJECT}}\boost\stage\lib\boost_python*.dll markopy-windows-py${{ matrix.python-version }}.pyd.zip"


- name: Upload Release Asset
- name: Upload Markopy Release Assets
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.reversion.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: ./windows-python${{ matrix.python-version }}.pyd.zip
asset_name: windows-python${{ matrix.python-version }}.pyd.zip
asset_path: ./markopy-windows-py${{ matrix.python-version }}.pyd.zip
asset_name: markopy-windows-py${{ matrix.python-version }}.pyd.zip
asset_content_type: application/zip

#Integrity check on pull requests with sonar
Expand Down

0 comments on commit 9b20e19

Please sign in to comment.