Skip to content

Commit

Permalink
Merge pull request #43 from Ishan09811/patch-10
Browse files Browse the repository at this point in the history
Auto git versioning
Ishan09811 authored Jun 8, 2024
2 parents ff1eaed + fb42642 commit daf7677
Showing 58 changed files with 3,772 additions and 550 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/Android_Build.yml
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@ on:
push:
branches:
- master
tags:
- '*'
pull_request:

jobs:
@@ -23,6 +25,16 @@ jobs:
- name: Fetch submodules
run: git submodule update --init --recursive

- name: Set up gradle caches
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-pandroid-x86_64-${{ github.sha }}
restore-keys: |
${{ runner.os }}-pandroid-x86_64-
- name: Setup Vulkan SDK
uses: humbletim/setup-vulkan-sdk@v1.2.0
with:
@@ -78,6 +90,16 @@ jobs:
- name: Fetch submodules
run: git submodule update --init --recursive

- name: Set up gradle caches
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-pandroid-arm64-${{ github.sha }}
restore-keys: |
${{ runner.os }}-pandroid-arm64-
- name: Setup Vulkan SDK
uses: humbletim/setup-vulkan-sdk@v1.2.0
with:
4 changes: 2 additions & 2 deletions .github/workflows/Hydra_Build.yml
Original file line number Diff line number Diff line change
@@ -36,11 +36,11 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: Windows core
path: '${{github.workspace}}/build/Release/Alber.dll'
path: '${{github.workspace}}/build/${{ env.BUILD_TYPE }}/Alber.dll'


MacOS:
runs-on: macos-latest
runs-on: macos-13

steps:
- uses: actions/checkout@v2
2 changes: 1 addition & 1 deletion .github/workflows/MacOS_Build.yml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ jobs:
# well on Windows or Mac. You can convert this to a matrix build if you need
# cross-platform coverage.
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
runs-on: macos-latest
runs-on: macos-13

steps:
- uses: actions/checkout@v2
2 changes: 1 addition & 1 deletion .github/workflows/Qt_Build.yml
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ jobs:
path: upload

MacOS:
runs-on: macos-latest
runs-on: macos-13

steps:
- uses: actions/checkout@v2
2 changes: 1 addition & 1 deletion .github/workflows/Windows_Build.yml
Original file line number Diff line number Diff line change
@@ -43,4 +43,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: Windows executable
path: './build/Release/Alber.exe'
path: './build/${{ env.BUILD_TYPE }}/Alber.exe'
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ build/

.vs/
.vscode/*.log

.cache/
ipch/
*.aps
*.ncb
@@ -65,3 +65,4 @@ fb.bat
*.smdh

config.toml
CMakeSettings.json
12 changes: 12 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -61,3 +61,15 @@
[submodule "third_party/dynarmic"]
path = third_party/dynarmic
url = https://github.com/Panda3DS-emu/dynarmic
[submodule "third_party/nihstro"]
path = third_party/nihstro
url = https://github.com/neobrain/nihstro.git
[submodule "third_party/Catch2"]
path = third_party/Catch2
url = https://github.com/catchorg/Catch2.git
[submodule "third_party/capstone"]
path = third_party/capstone
url = https://github.com/capstone-engine/capstone
[submodule "third_party/hips"]
path = third_party/hips
url = https://github.com/wheremyfoodat/Hips
Loading

0 comments on commit daf7677

Please sign in to comment.