Skip to content

Commit

Permalink
Update merge-linux.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
SamulKyull authored Apr 15, 2024
1 parent 2710fe9 commit 4eee839
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions .github/workflows/merge-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@ permissions:
contents: write

jobs:
linux-5_10:
runs-on: ubuntu-latest
env:
KERNEL_URL: https://cdn.kernel.org/pub/linux/kernel/v5.x/
KERNEL_VERSION: linux-5.10.214
KERNEL_BRANCH: linux-5.10
steps:
- uses: actions/checkout@v3
- name: Set id
run: |
git config --global user.name "GitHub Actions"
git config --global user.email "[email protected]"
# linux-5_10:
# runs-on: ubuntu-latest
# env:
# KERNEL_URL: https://cdn.kernel.org/pub/linux/kernel/v5.x/
# KERNEL_VERSION: linux-5.10.214
# KERNEL_BRANCH: linux-5.10
# steps:
# - uses: actions/checkout@v3
# - name: Set id
# run: |
# git config --global user.name "GitHub Actions"
# git config --global user.email "[email protected]"

- name: Merge ${{env.KERNEL_BRANCH}}
continue-on-error: true
run: ./init.sh -u ${{env.KERNEL_URL}} -v ${{env.KERNEL_VERSION}} -b ${{env.KERNEL_BRANCH}}
# - name: Merge ${{env.KERNEL_BRANCH}}
# continue-on-error: true
# run: ./init.sh -u ${{env.KERNEL_URL}} -v ${{env.KERNEL_VERSION}} -b ${{env.KERNEL_BRANCH}}

- name: Push changes ${{env.KERNEL_BRANCH}}
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.SY_PAT }}
branch: ${{env.KERNEL_BRANCH}}
directory: kernel/dst/${{env.KERNEL_BRANCH}}/${{env.KERNEL_BRANCH}}
force: true
# - name: Push changes ${{env.KERNEL_BRANCH}}
# uses: ad-m/github-push-action@master
# with:
# github_token: ${{ secrets.SY_PAT }}
# branch: ${{env.KERNEL_BRANCH}}
# directory: kernel/dst/${{env.KERNEL_BRANCH}}/${{env.KERNEL_BRANCH}}
# force: true

linux-5_15:
runs-on: ubuntu-latest
Expand Down

0 comments on commit 4eee839

Please sign in to comment.