Skip to content

Commit

Permalink
Merge branch 'development' of github.com:ortus-boxlang/bx-mariadb int…
Browse files Browse the repository at this point in the history
…o development
  • Loading branch information
michaelborn committed Nov 21, 2024
2 parents 3c00f2b + 482fcdd commit 69a506c
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 19 deletions.
27 changes: 12 additions & 15 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ jobs:
runs-on: ubuntu-latest
permissions:
checks: write
pull-requests: write
contents: write
issues: write
steps:
- name: Checkout Repository
uses: actions/checkout@v4
Expand Down Expand Up @@ -142,6 +144,7 @@ jobs:
run: |
cd build/module
box forgebox publish --force
cd $GITHUB_WORKSPACE
- name: Create Github Release
uses: taiki-e/create-gh-release-action@v1.8.0
Expand All @@ -154,19 +157,6 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
ref: refs/tags/v${{ env.VERSION }}

- name: Upload Release Asset
uses: sekwah41/upload-release-assets@v1
if: env.SNAPSHOT == 'false'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_name: boxlang-${{ env.VERSION }}.zip
asset_content_type: application/zip
asset_path: |
build/distributions/**
changelog.md
- name: Inform Slack
if: ${{ always() }}
uses: rtCamp/action-slack-notify@v2
Expand All @@ -189,7 +179,9 @@ jobs:
needs: [build]
permissions:
checks: write
pull-requests: write
contents: write
issues: write
steps:
- name: Checkout Development Repository
uses: actions/checkout@v4
Expand All @@ -201,6 +193,11 @@ jobs:
uses: actions/checkout@v4
if: env.LTS == 'true'

- name: Setup Gradle
uses: gradle/gradle-build-action@v3
with:
gradle-version: ${{ env.GRADLE }}

- name: Download build artifacts
uses: actions/download-artifact@v4
with:
Expand All @@ -215,9 +212,9 @@ jobs:
run: |
if [ $LTS == 'true' ]
then
./gradlew bumpPatchVersion --stacktrace --console=plain
gradle bumpPatchVersion --stacktrace --console=plain
else
./gradlew bumpMinorVersion --stacktrace --console=plain
gradle bumpMinorVersion --stacktrace --console=plain
fi
git pull
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ jobs:
secrets: inherit
permissions:
checks: write
pull-requests: write
contents: write
issues: write
with:
snapshot: true
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ task downloadBoxLang( type: Download ) {
*/
project.ext.bumpVersion = { boolean major = false, boolean minor = false, boolean patch = false ->

def propertiesFile = file( '../gradle.properties' );
def propertiesFile = file( './gradle.properties' );
def properties = new Properties();

properties.load( propertiesFile.newDataInputStream() )
Expand Down
2 changes: 0 additions & 2 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.0.0] => 2024-APR-05

* First iteration of this module
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Gradle Properties
version=1.0.0
version=1.1.0
group=com.ortussolutions
boxlangVersion=1.0.0
jdkVersion=21

0 comments on commit 69a506c

Please sign in to comment.