Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
nokotan committed Jul 22, 2024
2 parents 5f0e16c + 5469c44 commit 2af3bb6
Show file tree
Hide file tree
Showing 181 changed files with 7,261 additions and 1,951 deletions.
20 changes: 4 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,10 @@ jobs:
submodules: recursive

- name: Build
run: |
bash Build.sh
run: bash ci-scripts/Build.sh

- name: Pack
run: |
mkdir dest
mkdir dest/lib
cp build/libDxLib.a dest/lib/
cp build/libDxUseCLib.a dest/lib/
cp build/libDxDrawFunc.a dest/lib/
mkdir dest/include
cp DxCompileConfig.h dest/include/
cp DxDataType.h dest/include/
cp DxDataTypeHTML5.h dest/include/
cp DxFunctionHTML5.h dest/include/
cp DxLib.h dest/include/
zip -r DxLibForHTML5.zip dest
tar -cvzf DxLibForHTML5.tgz dest/*
run: bash Package.sh

- uses: actions/upload-artifact@v3
with:
Expand All @@ -54,6 +40,7 @@ jobs:
with:
upload_url: ${{ steps.create-release.outputs.upload_url }}
asset_path: DxLibForHTML5.zip
asset_name: DxLibForHTML5.zip
asset_content_type: application/zip

- name: Upload Release Asset (zip)
Expand All @@ -64,4 +51,5 @@ jobs:
with:
upload_url: ${{ steps.create-release.outputs.upload_url }}
asset_path: DxLibForHTML5.tgz
asset_name: DxLibForHTML5.tgz
asset_content_type: application/zip
3 changes: 3 additions & 0 deletions .github/workflows/cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- run: |
cp -r ci-scripts ci-scripts-temp
cd ci-scripts-temp
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
#Build Result
/Build/
/build
/dist
/DxLibHTML5.zip
/DxLibHTML5.tgz

#VS Config
/.vscode/
5 changes: 0 additions & 5 deletions Borland C++ �łɂ‚���.txt

This file was deleted.

Loading

0 comments on commit 2af3bb6

Please sign in to comment.