Skip to content

Commit

Permalink
Remove all DEVEL references [DI-241] (#224)
Browse files Browse the repository at this point in the history
Remove all DEVEL refs as we don't package DEVEL - only produce Docker
image. See JIRA for more details

Accompanied by hazelcast/homebrew-hz#38

Fixes [DI-241](https://hazelcast.atlassian.net/browse/DI-241)

---------

Co-authored-by: Jack Green <[email protected]>
  • Loading branch information
nishaatr and JackPGreen authored Aug 16, 2024
1 parent 77b4423 commit 456c0eb
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 39 deletions.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ Run the following to install e.g. version `5.0.1`:
brew install [email protected]
```

## Installing a SNAPSHOT/DEVEL/BETA version
## Installing a SNAPSHOT/BETA version

### Install a SNAPSHOT/DEVEL/BETA version with apt
### Install a SNAPSHOT/BETA version with apt

You need to replace `stable` with `snapshot`/`devel`/`beta` in
You need to replace `stable` with `snapshot`/`beta` in
the repository definition to use Hazelcast snapshots.

Run the following to install the latest snapshot version:
Expand All @@ -185,9 +185,9 @@ Install Hazelcast Enterprise (license required)
sudo apt install hazelcast-enterprise
```

### Install a SNAPSHOT/DEVEL/BETA version with yum
### Install a SNAPSHOT/BETA version with yum

You need to replace `stable` with `snapshot`/`devel`/`beta` in
You need to replace `stable` with `snapshot`/`beta` in
the repository definition to use Hazelcast snapshots.

Run the following to install the latest snapshot version:
Expand All @@ -203,16 +203,16 @@ Install Hazelcast Enterprise (license required)
sudo yum install hazelcast-enterprise
```

### Install a SNAPSHOT/DEVEL/BETA version with Homebrew
### Install a SNAPSHOT/BETA version with Homebrew

You need to add `snapshot`/`devel`/`beta` suffix to the package version when
You need to add `snapshot`/`beta` suffix to the package version when
installing a snapshot.

Run the following to install the latest `devel` version of Hazelcast Enterprise:
Run the following to install the latest `snapshot` version of Hazelcast Enterprise:

```shell
brew tap hazelcast/hz
brew install hazelcast-enterprise-devel
brew install hazelcast-enterprise-snapshot
```

Search for available versions using the following command:
Expand Down
4 changes: 2 additions & 2 deletions build-hazelcast-homebrew-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function generateFormula {
all_hz_versions=({hazelcast.rb,hazelcast?[0-9]*\.rb,hazelcast-enterprise*\.rb})
for version in "${all_hz_versions[@]}"
do
if [[ "$version" != "$file" ]] && [[ ! "$version" =~ .*(beta|devel).* ]] ; then
if [[ "$version" != "$file" && ! "$version" =~ .*beta.* ]] ; then
sed -i "/sha256.*$/a \ \ \ \ conflicts_with \"${version%.rb}\", because: \"you can install only a single hazelcast or hazelcast-enterprise package\"" "$file"
fi
done
Expand All @@ -67,7 +67,7 @@ function generateFormula {
BREW_CLASS=$(brewClass "${HZ_DISTRIBUTION}" "${BREW_PACKAGE_VERSION}")
generateFormula "$BREW_CLASS" "${HZ_DISTRIBUTION}@${BREW_PACKAGE_VERSION}.rb"

# Update hazelcast and hazelcast-x.y aliases only if the version is a stable release (not SNAPSHOT/DEVEL/BETA)
# Update hazelcast and hazelcast-x.y aliases only if the version is a stable release (not SNAPSHOT/BETA)
if [[ "$RELEASE_TYPE" = "stable" ]]; then
rm -f "Aliases/${HZ_DISTRIBUTION}-${HZ_MINOR_VERSION}" #migrate incrementally from symlinks to regular files
BREW_CLASS=$(brewClass "${HZ_DISTRIBUTION}${HZ_MINOR_VERSION}")
Expand Down
3 changes: 0 additions & 3 deletions common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ export RELEASE_TYPE=stable
if [[ "$HZ_VERSION" == *"SNAPSHOT"* ]]; then
export RELEASE_TYPE=snapshot
fi
if [[ "$HZ_VERSION" == *"DEVEL"* ]]; then
export RELEASE_TYPE=devel
fi
if [[ "$HZ_VERSION" == *"BETA"* ]]; then
export RELEASE_TYPE=beta
fi
Expand Down
3 changes: 0 additions & 3 deletions common_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ assertReleaseType "5.2.0-SNAPSHOT" "snapshot"
assertReleaseType "5.2-SNAPSHOT" "snapshot"
assertReleaseType "5.2.0-BETA-1" "beta"
assertReleaseType "5.2-BETA-1" "beta"
assertReleaseType "5.1.0-DEVEL-8" "devel"
assertReleaseType "5.1-DEVEL-8" "devel"
assertReleaseType "5.0" "stable"
assertReleaseType "5.1" "stable"
assertReleaseType "5.1.1" "stable"
Expand All @@ -50,7 +48,6 @@ assertPackageVersions "5.0.2" "5.0.2-1" "5.0.2-1" "5.0.2-
assertPackageVersions "5.1" "5.1" "5.1-1" "5.1-1"
assertPackageVersions "5.1" "5.1-1" "5.1-1" "5.1-1"
assertPackageVersions "5.1-SNAPSHOT" "5.1-SNAPSHOT" "5.1-SNAPSHOT-1" "5.1.SNAPSHOT-1"
assertPackageVersions "5.1-DEVEL" "5.1-DEVEL" "5.1-DEVEL-1" "5.1.DEVEL-1"
assertPackageVersions "5.1-BETA-1" "5.1-BETA-1" "5.1-BETA-1-1" "5.1.BETA.1-1"
assertPackageVersions "5.1-BETA-1" "5.1-BETA-1-2" "5.1-BETA-1-2" "5.1.BETA.1-2"
assertPackageVersions "5.2.0-SNAPSHOT" "5.2.0-SNAPSHOT" "5.2.0-SNAPSHOT-1" "5.2.0.SNAPSHOT-1"
Expand Down
3 changes: 0 additions & 3 deletions packages/brew/brew_functions_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,12 @@ log_header "Tests for alphanumCamelCase"
assertAlphanumCamelCase "5.2.0-SNAPSHOT" "520Snapshot"
assertAlphanumCamelCase "5.2-SNAPSHOT" "52Snapshot"
assertAlphanumCamelCase "5.2-BETA-1" "52Beta1"
assertAlphanumCamelCase "5.1-DEVEL-8" "51Devel8"
assertAlphanumCamelCase "5.2" "52"
assertAlphanumCamelCase "5.2.0" "520"
assertAlphanumCamelCase "5.2.1" "521"
assertAlphanumCamelCase "" ""
assertAlphanumCamelCase "snapshot" "Snapshot"
assertAlphanumCamelCase "beta" "Beta"
assertAlphanumCamelCase "devel" "Devel"

function assertBrewClass {
local distribution=$1
Expand All @@ -44,7 +42,6 @@ log_header "Tests for brewClass"
assertBrewClass "hazelcast" "5.2.0-SNAPSHOT" "HazelcastAT520Snapshot"
assertBrewClass "hazelcast" "5.2-SNAPSHOT" "HazelcastAT52Snapshot"
assertBrewClass "hazelcast-enterprise" "5.2-BETA-1" "HazelcastEnterpriseAT52Beta1"
assertBrewClass "hazelcast" "5.2-DEVEL-3" "HazelcastAT52Devel3"
assertBrewClass "hazelcast" "5.2" "HazelcastAT52"
assertBrewClass "hazelcast" "5.2.0" "HazelcastAT520"
assertBrewClass "hazelcast" "" "Hazelcast"
Expand Down
5 changes: 0 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,5 @@
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>hazelcast-devel-repository</id>
<name>Hazelcast Private Development Repository</name>
<url>https://repository.hazelcast.com/devel/</url>
</repository>
</repositories>
</project>
7 changes: 0 additions & 7 deletions repos/prod/hazelcast-rpm-devel.repo

This file was deleted.

7 changes: 0 additions & 7 deletions repos/test/hazelcast-rpm-devel.repo

This file was deleted.

0 comments on commit 456c0eb

Please sign in to comment.