diff --git a/.github/workflows/bla.yml b/.github/workflows/bla.yml new file mode 100644 index 0000000..efeeff7 --- /dev/null +++ b/.github/workflows/bla.yml @@ -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 'kaloyan@triplehelix-consulting.com' + + # "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