diff --git a/.github/workflows/multi-event.yml b/.github/workflows/multi-event.yml new file mode 100644 index 000000000..6b0c5a9b3 --- /dev/null +++ b/.github/workflows/multi-event.yml @@ -0,0 +1,21 @@ +name: Trigger multi event + +on: + push: + branches: + - main + - dev + pull_request: + branches: + - main + +jobs: + Hi_from_developer: + runs-on: ubuntu-latest + steps: + - name: "Echo information" + run: | + echo "REF: $GITHUB_REF" + echo "Job id: $GITHUB_JOB" + echo "Action: $GITHUB_ACTION" + echo "Actor: $GITHUB_ACTOR" \ No newline at end of file diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml new file mode 100644 index 000000000..cc2649382 --- /dev/null +++ b/.github/workflows/schedule.yml @@ -0,0 +1,12 @@ +name: Scheduled workflow +on: + schedule: + - cron: '*/5 * * * *' + +jobs: + hello_world: + runs-on: ubuntu-latest + steps: + - name: Current time + run: echo "The current server time is $(date)" + diff --git a/.github/workflows/custom-action.yml b/github-actions/templates/custom-action.yml similarity index 100% rename from .github/workflows/custom-action.yml rename to github-actions/templates/custom-action.yml diff --git a/github-actions/templates/greetings.yml b/github-actions/templates/greetings.yml index 996da6bbd..46774343e 100644 --- a/github-actions/templates/greetings.yml +++ b/github-actions/templates/greetings.yml @@ -9,7 +9,6 @@ jobs: issues: write pull-requests: write steps: - # https://github.com/actions/first-interaction - uses: actions/first-interaction@v1 with: repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/github-actions/templates/multi-event.yml b/github-actions/templates/multi-event.yml deleted file mode 100644 index a3275be38..000000000 --- a/github-actions/templates/multi-event.yml +++ /dev/null @@ -1,19 +0,0 @@ -on: - push: - branches: - - main - - dev - pull_request: - branches: - - main - -jobs: - hello_world: - runs-on: ubuntu-latest - steps: - - name: "Echo Basic Information" - run: | - echo "REF: $GITHUB_REF" - echo "Job ID: $GITHUB_JOB" - echo "Action: $GITHUB_ACTION" - echo "Actor: $GITHUB_ACTOR" \ No newline at end of file diff --git a/markdown/Secret.md b/markdown/Secret.md index 85db16f36..bdffd2e74 100644 --- a/markdown/Secret.md +++ b/markdown/Secret.md @@ -1 +1,7 @@ -**Secret page**s \ No newline at end of file +**Secret page**s +I made simple change on branch dev +<<<<<<< HEAD + +This is second change to trigger the event on push of dev +====== +>>>>>>> 4beaaf3e676fd377c782d0455f10b4f8b0395360 \ No newline at end of file