Skip to content

Commit

Permalink
Merge pull request #4 from gedestroy/make-vertx-redisques-build-pass-…
Browse files Browse the repository at this point in the history
…on-github-actions

Make vertx redisques build pass on GitHub actions
  • Loading branch information
gedestroy authored Oct 5, 2022
2 parents 34478e3 + 5f3e76a commit 4a54697
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/maybe-release-github.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
set -ev
if [ "$GITHUB_REF_NAME" == "master" ] && [ "$GITHUB_REF_PROTECTED" == "false" ] && [ "$GITHUB_REPOSITORY" == "gedestroy/vertx-redisques" ]
if [ "$GITHUB_REF_NAME" == "develop" ] && [ "$GITHUB_REF_PROTECTED" == "false" ] && [ "$GITHUB_REPOSITORY" == "gedestroy/vertx-redisques" ]
then
git reset --hard
git clean -fd
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ name: Java CI with Maven
on:
workflow_dispatch:
push:
branches: [ "master" ]
branches: [ "develop" ]
pull_request:
branches: [ "master" ]
branches: [ "develop" ]

jobs:
build_maven:
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@
<version>1.0-m5.1</version>
<configuration>
<flowInitContext>
<masterBranchName>master</masterBranchName>
<developBranchName>develop</developBranchName>
<masterBranchName>develop</masterBranchName>
<developBranchName>make-vertx-redisques-build-pass-on-github-actions</developBranchName>
<featureBranchPrefix>feature-</featureBranchPrefix>
<releaseBranchPrefix>release-</releaseBranchPrefix>
<hotfixBranchPrefix>hotfix-</hotfixBranchPrefix>
Expand Down

0 comments on commit 4a54697

Please sign in to comment.