Skip to content

Commit

Permalink
Merge pull request #74 from ballerina-platform/revert-69-dev
Browse files Browse the repository at this point in the history
Revert "Add publish timestamped release workflow"
  • Loading branch information
nadundesilva committed May 7, 2021
2 parents 607dbb5 + 9da0e5c commit 27fbc1a
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 48 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build-dev-branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ on:

jobs:
ubuntu-build:
name: Build Development Branches on Ubuntu
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand All @@ -28,7 +27,6 @@ jobs:
./gradlew clean build --stacktrace --scan --console=plain --no-daemon
windows-build:
name: Build Development Branches on Windows
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:

jobs:
build:
name: Build Main Branch
runs-on: ubuntu-latest
if: github.repository_owner == 'ballerina-platform'
steps:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/daily-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:

jobs:
ubuntu-build:
name: Daily Builds to verify on Ubuntu
runs-on: ubuntu-latest
if: github.repository_owner == 'ballerina-platform'
steps:
Expand All @@ -24,7 +23,6 @@ jobs:
run: ./gradlew clean build --stacktrace --scan --console=plain --no-daemon

windows-build:
name: Daily Builds to verify on Windows
runs-on: windows-latest
if: github.repository_owner == 'ballerina-platform'
steps:
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on: [workflow_dispatch]

jobs:
publish-release:
name: Publish Release
runs-on: ubuntu-latest
if: github.repository_owner == 'ballerina-platform'
steps:
Expand All @@ -14,7 +13,7 @@ jobs:
with:
java-version: 11
- name: Set version env variable
run: echo "VERSION=$((grep -w 'version' | cut -d= -f2) < gradle.properties | cut -d- -f1)" >> ${GITHUB_ENV}
run: echo "VERSION=$((grep -w 'version' | cut -d= -f2) < gradle.properties | cut -d- -f1)" >> $GITHUB_ENV
- name: Pre release depenency version update
env:
GITHUB_TOKEN: ${{ secrets.BALLERINA_BOT_TOKEN }}
Expand Down Expand Up @@ -47,12 +46,12 @@ jobs:
--header 'Authorization: Bearer ${{ secrets.BALLERINA_BOT_TOKEN }}' \
--header 'Content-Type: application/json' \
--data-raw '{
"tag_name": "v'"${VERSION}"'",
"name": "module-ballerinax-prometheus-v'"${VERSION}"'"
"tag_name": "v'"$VERSION"'",
"name": "module-ballerinax-prometheus-v'"$VERSION"'"
}'
- name: Post release PR
env:
GITHUB_TOKEN: ${{ secrets.BALLERINA_BOT_TOKEN }}
run: |
curl -fsSL https://github.com/github/hub/raw/master/script/get | bash -s 2.14.1
bin/hub pull-request --base main -m "[Automated] Sync master after "${VERSION}" release"
bin/hub pull-request --base main -m "[Automated] Sync master after "$VERSION" release"
35 changes: 0 additions & 35 deletions .github/workflows/publish-timestamped-release.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on: pull_request

jobs:
ubuntu-build:
name: Validate PR on Ubuntu
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand All @@ -25,7 +24,6 @@ jobs:
uses: codecov/codecov-action@v1

windows-build:
name: Validate PR on Windows
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion prometheus-extension-ballerina/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def artifactBallerinaDocs = file("${project.projectDir}/build/docs_parent/")
def artifactCacheParent = file("${project.buildDir}/cache_parent/")
def artifactLibParent = file("${project.buildDir}/lib_parent/")
def snapshotVersion = "-SNAPSHOT"
def tomlVersion = "${project.version}"
def tomlVersion = stripBallerinaExtensionVersion("${project.version}")
def ballerinaCentralAccessToken = System.getenv('BALLERINA_CENTRAL_ACCESS_TOKEN')
def originalConfig = ballerinaConfigFile.text
def originalDependencyConfig = ballerinaDependencyFile.text
Expand Down

0 comments on commit 27fbc1a

Please sign in to comment.