Skip to content

Fix merge conflict

Fix merge conflict #24

Workflow file for this run

name: GitHub Actions Build
on:
push:
paths-ignore:
- "**/*.md"
- '**/*.txt'
branches:
- '**'
pull_request:
paths-ignore:
- "**/*.md"
- '**/*.txt'
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.event_name != 'workflow_dispatch' }}
permissions:
contents: write
jobs:
build:
runs-on: windows-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
submodules: recursive
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@main
<<<<<<< HEAD

Check failure on line 35 in .github/workflows/msvc_x86.yml

View workflow run for this annotation

GitHub Actions / .github/workflows/msvc_x86.yml

Invalid workflow file

You have an error in your yaml syntax on line 35
=======
- name: Auto Increment Version
uses: MCKanpolat/auto-semver-action@v2
id: versioning
with:
releaseType: ${{ env.VERINC }}
incrementPerCommit: false
github_token: ${{ secrets.GITHUB_TOKEN }}
>>>>>>> upstream/master
- name: Configure build
run: ./premake5 vs2022 --with-version=vs2022
- name: Build
run: |
msbuild -m build/GTAIV.EFLC.FusionFix.sln /property:Configuration=Release /property:Platform=Win32
- name: Download Ultimate ASI Loader x86
uses: robinraju/release-downloader@v1.8
with:
repository: "ThirteenAG/Ultimate-ASI-Loader"
tag: "Win32-latest"
fileName: "dinput8-Win32.zip"
- name: Unpack dependencies
run: |
7z x dinput8-Win32.zip -odata/ -y
del dinput8-Win32.zip
del data\dinput8-Win32.SHA512
- name: Pack binaries
run: |
./release.bat
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: GTAIV.EFLC.FusionFix-GFWL.zip
path: release/*