Skip to content

Commit

Permalink
Merge pull request #1008 from guzzijones/circle
Browse files Browse the repository at this point in the history
fix lerna version
  • Loading branch information
arm4b authored Oct 19, 2023
2 parents 73e75f6 + 7e7a222 commit e409aaa
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
8 changes: 5 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
version: 2
jobs:
build:
machine: true
machine:
# pin image to older version as "ubuntu-2204:2023.10.1" breaks on "nvm" step
image: ubuntu-2204:2023.04.2
environment:
DEPLOY_PACKAGES: 1
DEB: bionic focal
RPM: el7 el8
ST2_VERSION: "3.6dev"
ST2_VERSION: "3.9dev"
ST2_HOST: localhost
ST2_PROTOCOL: http
ST2_USERNAME: st2admin
Expand Down Expand Up @@ -58,7 +60,7 @@ jobs:
sudo apt-get install rpm jq devscripts debhelper
gem install package_cloud
nvm use 14.20.1
npm install --global lerna yarn
npm install --global lerna@6.0.0 yarn
- run:
name: Install package dependencies
command: |
Expand Down
14 changes: 9 additions & 5 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ Changelog
in development
--------------

Fixed
~~~~~
* Fixed CircleCI tests by pinning [email protected]. #1008

Contributed by @guzzijones


st2 v3.8.0
------

Added
~~~~~
Expand All @@ -30,7 +39,6 @@ Changed

Reported by @cded from @Bitovi


Fixed
~~~~~
* Fixed CircleCI tests
Expand All @@ -44,7 +52,3 @@ Fixed
* Escaped text in notifications. #990

Contributed by @cded from @Bitovi


v2.4.3
------
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ all: build
# yarn now included in later node images
npm-install:
echo "npm install"
npm install -g lerna
npm install -g lerna@6.0.0

lerna:
echo "lerna"
Expand Down

0 comments on commit e409aaa

Please sign in to comment.