Skip to content

Commit

Permalink
create bla.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
kaloyanski authored Nov 21, 2023
1 parent 7218637 commit f7fe604
Showing 1 changed file with 39 additions and 0 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/bla.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# This is a basic workflow to help you get started with Actions
# meta-thc/.github/workflows/bla.yml

name: bla

# Controls when the workflow will run
on:
schedule:
# ~5 minutes
- cron: '* * * * *'
# Triggers the workflow on push or pull request events but only for the "kirkstone" branch
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
merge:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: merge upstream
run: |
git config --global user.name 'kaloyanski'
git config --global user.email '[email protected]'
# "git checkout master" is unnecessary, already here by default
git pull --unshallow # this option is very important, you would get
# complains about unrelated histories without it.
# (but actions/checkout@v2 can also be instructed
# to fetch all git depth right from the start)
git remote add upstream https://github.com/kaloyanski/meta-thc.git
git fetch upstream
# Neither forget the -b opt,
# the feature/x ref is ambiguous at this stage
git checkout -b io origin/io
git merge --no-edit upstream/io
git push origin io

0 comments on commit f7fe604

Please sign in to comment.