diff options
| author | Jack <66967891+ASpoonPlaysGames@users.noreply.github.com> | 2023-12-27 00:32:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-27 01:32:01 +0100 |
| commit | f5ab6fb5e8be7b73e6003d4145081d5e0c0ce287 (patch) | |
| tree | 90f2c6a4885dbd181799e2325cf33588697674e1 /.github | |
| parent | bb8ed59f6891b1196c5f5bbe7346cd171c8215fa (diff) | |
| download | NorthstarLauncher-f5ab6fb5e8be7b73e6003d4145081d5e0c0ce287.tar.gz NorthstarLauncher-f5ab6fb5e8be7b73e6003d4145081d5e0c0ce287.zip | |
Folder restructuring from primedev (#624)v1.21.2-rc3v1.21.2
Copies of over the primedev folder structure for easier cherry-picking of further changes
Co-authored-by: F1F7Y <filip.bartos07@proton.me>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4aa37aa..6e0f28f5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,10 +20,10 @@ jobs: - name: Setup resource file version shell: bash run: | - sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarLauncher/resources.rc - sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarDLL/resources.rc + sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' primedev/primelauncher/resources.rc + sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' primedev/resources.rc FILEVERSION=$(echo ${{ env.NORTHSTAR_VERSION }} | tr '.' ',' | sed -E 's/-rc[0-9]+//' | tr -d '[:alpha:]') - sed -i "s/0,0,0,1/${FILEVERSION}/g" NorthstarDLL/ns_version.h + sed -i "s/0,0,0,1/${FILEVERSION}/g" primedev/ns_version.h - name: Build run: cmake --build . - name: Extract Short Commit Hash @@ -43,8 +43,8 @@ jobs: - uses: actions/checkout@v3 - uses: DoozyX/clang-format-lint-action@v0.16.2 with: - source: 'NorthstarDLL NorthstarLauncher' - exclude: 'NorthstarDLL/include loader_launcher_proxy loader_wsock32_proxy' + source: 'primedev' + exclude: 'primedev/include primedev/thirdparty primedev/wsockproxy' extensions: 'h,cpp' clangFormatVersion: 16 style: file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8aebf495..e6dd8cc3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,10 +25,10 @@ jobs: - name: Setup resource file version shell: bash run: | - sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarLauncher/resources.rc - sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarDLL/resources.rc + sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' primedev/primelauncher/resources.rc + sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' primedev/resources.rc FILEVERSION=$(echo ${{ env.NORTHSTAR_VERSION }} | tr '.' ',' | sed -E 's/-rc[0-9]+//' | tr -d '[:alpha:]') - sed -i "s/0,0,0,1/${FILEVERSION}/g" NorthstarDLL/ns_version.h + sed -i "s/0,0,0,1/${FILEVERSION}/g" primedev/ns_version.h - name: Build run: cmake --build . - name: Upload launcher build as artifact |