Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
DarkWanderer committed Dec 31, 2024
2 parents 0cac7a3 + bae1a70 commit 6a0d8c7
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 0 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/on-push-linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Linux

on:
workflow_dispatch:
push:
branches:
- linux
paths-ignore: [ 'Doc/**', 'Flights/**', 'Html/**', 'Images/**', 'Localdoc/**', 'Scenarios/**', 'Textures/**', 'Textures2/**']
pull_request:
branches:
- linux
paths-ignore: [ 'Doc/**', 'Flights/**', 'Html/**', 'Images/**', 'Localdoc/**', 'Scenarios/**', 'Textures/**', 'Textures2/**']

jobs:
build:
name: Push
strategy:
fail-fast: false
matrix:
architecture: [x64]
os: [ubuntu-latest]
uses: ./.github/workflows/reusable-build.yml
with:
os: ${{ matrix.os }}
architecture: ${{ matrix.architecture }}
26 changes: 26 additions & 0 deletions .github/workflows/update-linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Update Linux branch
on:
workflow_dispatch:
push:
branches: ["main"]

permissions:
contents: write

jobs:
update:
name: Update 'linux' branch
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: linux
- name: Update branch
run: |
git config user.name github-actions
git config user.email [email protected]
git checkout linux
git merge origin/main --no-edit -m "Merged main branch on $(date +%F)"
git push origin linux

0 comments on commit 6a0d8c7

Please sign in to comment.