Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Binarize - Linux Support #670

Merged
merged 32 commits into from
Oct 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b23a0f1
linux binarize
BrettMayson Mar 20, 2024
b721923
return report
BrettMayson Mar 20, 2024
a97b048
more testing
BrettMayson Mar 20, 2024
42be3a9
more testing
BrettMayson Mar 20, 2024
d20e6bc
setup tmp on linux
BrettMayson Mar 20, 2024
e37c199
setup tmp on linux
BrettMayson Mar 20, 2024
54b21f2
setup tmp on linux
BrettMayson Mar 20, 2024
1e42ec4
winbind
BrettMayson Mar 20, 2024
67d68ab
try xvfb
BrettMayson Mar 20, 2024
9e22e56
tree
BrettMayson Mar 20, 2024
5d30fb4
maybe it wants this stuff idk
BrettMayson Mar 20, 2024
d8cb4ef
Merge branch 'main' into linux_binarize
BrettMayson Oct 18, 2024
1eebe1a
trying again
BrettMayson Oct 18, 2024
4cacdc0
wine64
BrettMayson Oct 18, 2024
b29b97e
disable macos
BrettMayson Oct 18, 2024
133fde9
idk
BrettMayson Oct 18, 2024
7aec3ef
I know a bit more now
BrettMayson Oct 18, 2024
22e1f03
wine64
BrettMayson Oct 18, 2024
2f75950
fix more
BrettMayson Oct 18, 2024
63003cd
strip tmp_source
BrettMayson Oct 18, 2024
6ffc8a5
more trim maybe
BrettMayson Oct 18, 2024
102ed03
and fix trim
BrettMayson Oct 18, 2024
ec1c768
working binarize, test on windows too now
BrettMayson Oct 18, 2024
41876bd
remove display again
BrettMayson Oct 18, 2024
246d1c2
fix binarize on windows
BrettMayson Oct 18, 2024
6c890d2
use python arma3-tools
BrettMayson Oct 18, 2024
c33eed0
use python arma3-tools
BrettMayson Oct 18, 2024
56aa379
use typescript action
BrettMayson Oct 18, 2024
0fb469b
more trim
BrettMayson Oct 18, 2024
096151e
use steam arma 3 tools
BrettMayson Oct 18, 2024
b146c16
use proton
BrettMayson Oct 19, 2024
179beda
use linux arma3-tools
BrettMayson Oct 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
176 changes: 88 additions & 88 deletions .github/workflows/browser.yaml
Original file line number Diff line number Diff line change
@@ -1,92 +1,92 @@
name: Browser
# name: Browser

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
# on:
# push:
# branches: [ main ]
# pull_request:
# branches: [ main ]

jobs:
build-wasm:
name: Build WASM
runs-on: ubuntu-latest
steps:
- name: Checkout the source code
uses: actions/checkout@master
- name: Install wasm-pack
run: cargo install wasm-pack
- name: Rust Cache
uses: Swatinem/rust-cache@v2
with:
key: browser
- name: Build
run: wasm-pack build libs/paa --target web --features wasm
- name: Rename
run: |
mv libs/paa/pkg/hemtt_paa_bg.wasm hemtt_paa_bg.wasm
mv libs/paa/pkg/hemtt_paa.js hemtt_paa.js
- name: Upload
uses: actions/upload-artifact@v4
with:
name: wasm
path: |
hemtt_paa_bg.wasm
hemtt_paa.js
# jobs:
# build-wasm:
# name: Build WASM
# runs-on: ubuntu-latest
# steps:
# - name: Checkout the source code
# uses: actions/checkout@master
# - name: Install wasm-pack
# run: cargo install wasm-pack
# - name: Rust Cache
# uses: Swatinem/rust-cache@v2
# with:
# key: browser
# - name: Build
# run: wasm-pack build libs/paa --target web --features wasm
# - name: Rename
# run: |
# mv libs/paa/pkg/hemtt_paa_bg.wasm hemtt_paa_bg.wasm
# mv libs/paa/pkg/hemtt_paa.js hemtt_paa.js
# - name: Upload
# uses: actions/upload-artifact@v4
# with:
# name: wasm
# path: |
# hemtt_paa_bg.wasm
# hemtt_paa.js

firefox:
name: Firefox
runs-on: ubuntu-latest
needs: build-wasm
steps:
- name: Checkout the source code
uses: actions/checkout@v4
- name: Download wasm
uses: actions/download-artifact@v4
with:
name: wasm
path: wasm
- name: Move wasm
run: |
mv wasm/hemtt_paa_bg.wasm browser/hemtt_paa_bg.wasm
mv wasm/hemtt_paa.js browser/hemtt_paa.js
- name: Rename manifest
run: mv browser/manifest.firefox.json browser/manifest.json && rm browser/manifest.chrome.json
- name: zip
run: |
cd browser
zip -r firefox.zip *
mv firefox.zip ../firefox.zip
- name: Upload
uses: actions/upload-artifact@v4
with:
name: firefox
path: firefox.zip
# firefox:
# name: Firefox
# runs-on: ubuntu-latest
# needs: build-wasm
# steps:
# - name: Checkout the source code
# uses: actions/checkout@v4
# - name: Download wasm
# uses: actions/download-artifact@v4
# with:
# name: wasm
# path: wasm
# - name: Move wasm
# run: |
# mv wasm/hemtt_paa_bg.wasm browser/hemtt_paa_bg.wasm
# mv wasm/hemtt_paa.js browser/hemtt_paa.js
# - name: Rename manifest
# run: mv browser/manifest.firefox.json browser/manifest.json && rm browser/manifest.chrome.json
# - name: zip
# run: |
# cd browser
# zip -r firefox.zip *
# mv firefox.zip ../firefox.zip
# - name: Upload
# uses: actions/upload-artifact@v4
# with:
# name: firefox
# path: firefox.zip

chrome:
name: Chrome
runs-on: ubuntu-latest
needs: build-wasm
steps:
- name: Checkout the source code
uses: actions/checkout@v4
- name: Download wasm
uses: actions/download-artifact@v4
with:
name: wasm
path: wasm
- name: Move wasm
run: |
mv wasm/hemtt_paa_bg.wasm browser/hemtt_paa_bg.wasm
mv wasm/hemtt_paa.js browser/hemtt_paa.js
- name: Rename manifest
run: mv browser/manifest.chrome.json browser/manifest.json && rm browser/manifest.firefox.json
- name: zip
run: |
cd browser
zip -r chrome.zip *
mv chrome.zip ../chrome.zip
- name: Upload
uses: actions/upload-artifact@v4
with:
name: chrome
path: chrome.zip
# chrome:
# name: Chrome
# runs-on: ubuntu-latest
# needs: build-wasm
# steps:
# - name: Checkout the source code
# uses: actions/checkout@v4
# - name: Download wasm
# uses: actions/download-artifact@v4
# with:
# name: wasm
# path: wasm
# - name: Move wasm
# run: |
# mv wasm/hemtt_paa_bg.wasm browser/hemtt_paa_bg.wasm
# mv wasm/hemtt_paa.js browser/hemtt_paa.js
# - name: Rename manifest
# run: mv browser/manifest.chrome.json browser/manifest.json && rm browser/manifest.firefox.json
# - name: zip
# run: |
# cd browser
# zip -r chrome.zip *
# mv chrome.zip ../chrome.zip
# - name: Upload
# uses: actions/upload-artifact@v4
# with:
# name: chrome
# path: chrome.zip
21 changes: 10 additions & 11 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ jobs:
artifact: windows-x64
exe: hemtt.exe
# Intel Mac
- runner: macos-13
name: macos-x64
artifact: macos-x64
exe: hemtt
# ARM Mac
- runner: macos-latest
name: macos-arm
artifact: macos-arm64
exe: hemtt
# - runner: macos-13
# name: macos-x64
# artifact: macos-x64
# exe: hemtt
# # ARM Mac
# - runner: macos-latest
# name: macos-arm
# artifact: macos-arm64
# exe: hemtt
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
Expand Down Expand Up @@ -110,8 +110,7 @@ jobs:
run: |
cd mod && hemtt dev
- name: Install Arma 3 Tools
if: startsWith(matrix.os.runner, 'windows')
uses: arma-actions/arma3-tools@master
uses: arma-actions/arma3-tools@linux
with:
toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }}
- name: Run `hemtt build` on ${{ matrix.mod.repo }}
Expand Down
104 changes: 52 additions & 52 deletions .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
name: Coverage
# name: Coverage

on:
push:
branches: [main]
pull_request:
# on:
# push:
# branches: [main]
# pull_request:

permissions:
contents: read
# permissions:
# contents: read

env:
CARGO_TERM_COLOR: always
# env:
# CARGO_TERM_COLOR: always

jobs:
coverage:
name: ${{ matrix.os.name }} / tests
runs-on: ${{ matrix.os.runner }}
strategy:
fail-fast: false
matrix:
os:
- runner: ubuntu-latest
name: ubuntu
- runner: windows-latest
name: windows
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Install stable
uses: dtolnay/rust-toolchain@stable
with:
components: llvm-tools-preview
- uses: taiki-e/install-action@cargo-llvm-cov
- uses: taiki-e/install-action@nextest
- name: cargo generate-lockfile
if: hashFiles('Cargo.lock') == ''
run: cargo generate-lockfile
- name: Install Arma 3 Tools
if: startsWith(matrix.os.runner, 'windows')
uses: arma-actions/arma3-tools@master
with:
toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }}
- name: cargo llvm-cov
run: cargo llvm-cov nextest --locked --all-features --lcov --output-path out.lcov
- name: Upload Coverage to GitHub Artifacts
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os.name }}-coverage
path: out.lcov
- name: Upload to codecov.io
uses: codecov/codecov-action@v4
with:
files: out.lcov
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
# jobs:
# coverage:
# name: ${{ matrix.os.name }} / tests
# runs-on: ${{ matrix.os.runner }}
# strategy:
# fail-fast: false
# matrix:
# os:
# - runner: ubuntu-latest
# name: ubuntu
# - runner: windows-latest
# name: windows
# steps:
# - uses: actions/checkout@v4
# with:
# submodules: true
# - name: Install stable
# uses: dtolnay/rust-toolchain@stable
# with:
# components: llvm-tools-preview
# - uses: taiki-e/install-action@cargo-llvm-cov
# - uses: taiki-e/install-action@nextest
# - name: cargo generate-lockfile
# if: hashFiles('Cargo.lock') == ''
# run: cargo generate-lockfile
# - name: Install Arma 3 Tools
# if: startsWith(matrix.os.runner, 'windows')
# uses: arma-actions/arma3-tools@master
# with:
# toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }}
# - name: cargo llvm-cov
# run: cargo llvm-cov nextest --locked --all-features --lcov --output-path out.lcov
# - name: Upload Coverage to GitHub Artifacts
# uses: actions/upload-artifact@v4
# with:
# name: ${{ matrix.os.name }}-coverage
# path: out.lcov
# - name: Upload to codecov.io
# uses: codecov/codecov-action@v4
# with:
# files: out.lcov
# fail_ci_if_error: true
# token: ${{ secrets.CODECOV_TOKEN }}
Loading
Loading