Skip to content

Commit

Permalink
Merge branch 'master' into HUBBLE-526-protocol22-changes
Browse files Browse the repository at this point in the history
  • Loading branch information
chowbao committed Oct 29, 2024
2 parents f9b77b6 + 7706ea3 commit 2c5cec2
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ change is, and why it is being made, with enough context for anyone to understan
### Release planning

- [ ] I've decided if this PR requires a new major/minor/patch version accordingly to
[semver](https://semver.org/), and I've changed the name of the BRANCH to release/_ , feature/_ or patch/\* .
[semver](https://semver.org/), and I've changed the name of the BRANCH to major/_ , minor/_ or patch/\* .
</details>

### What
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ name: Release Drafter and Publisher

on:
pull_request:
types: [closed]
types:
- closed

concurrency:
group: ${{ github.workflow }}-${{ github.ref_protected == 'true' && github.sha || github.ref }}-{{ github.event_name }}
Expand All @@ -13,7 +14,7 @@ permissions:

jobs:
new_release:
if: github.event.pull_request.merged == true
if: github.ref == 'refs/heads/master' && github.event.pull_request.merged == true
permissions:
# write permission is required to create a github release
contents: write
Expand Down Expand Up @@ -44,14 +45,14 @@ jobs:
CURRENT_VERSION="${{ steps.gettag.outputs.TAG }}"
CURRENT_VERSION="${CURRENT_VERSION#v}" # Remove the 'v' from the start of the version
IFS='.' read -ra VERSION_PARTS <<< "$CURRENT_VERSION"
if [[ $BRANCH_NAME =~ ^release/ ]]; then
if [[ $BRANCH_NAME =~ ^major/ ]]; then
VERSION_PARTS[0]=$((VERSION_PARTS[0] + 1))
VERSION_PARTS[1]=0
VERSION_PARTS[2]=0
elif [[ $BRANCH_NAME =~ ^feature/ ]]; then
elif [[ $BRANCH_NAME =~ ^minor/ ]]; then
VERSION_PARTS[1]=$((VERSION_PARTS[1] + 1))
VERSION_PARTS[2]=0
elif [[ $BRANCH_NAME =~ ^patch/ ]]; then
else
VERSION_PARTS[2]=$((VERSION_PARTS[2] + 1))
fi
NEXT_VERSION="v${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.${VERSION_PARTS[2]}"
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Please refer to https://github.com/stellar/stellar-etl/releases
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ The Stellar-ETL is a data pipeline that allows users to extract data from the hi

Pay attention, it is very important to know if your modification to this repository is a release (breaking changes), a feature (functionalities) or a patch(to fix bugs). With that information, create your branch name like this:

- `release/<branch-name>`
- `feature/<branch-name>`
- `major/<branch-name>`
- `minor/<branch-name>`
- `patch/<branch-name>`

If branch is already made, just rename it _before passing the pull request_.
Expand Down
2 changes: 2 additions & 0 deletions internal/transform/contract_data.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package transform
import (
"fmt"
"math/big"
"strings"

"github.com/stellar/go/ingest"
"github.com/stellar/go/strkey"
Expand Down Expand Up @@ -71,6 +72,7 @@ func (t *TransformContractDataStruct) TransformContractData(ledgerChange ingest.
if contractDataAsset != nil {
contractDataAssetType = contractDataAsset.Type.String()
contractDataAssetCode = contractDataAsset.GetCode()
contractDataAssetCode = strings.ReplaceAll(contractDataAssetCode, "\x00", "")
contractDataAssetIssuer = contractDataAsset.GetIssuer()
}

Expand Down

0 comments on commit 2c5cec2

Please sign in to comment.