diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a32eb25e3..8debea4997 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -155,53 +155,40 @@ jobs: name: Execute test command: ./test-flux.sh || exit 1 no_output_timeout: 1500s - changelog: - machine: - image: ubuntu-2004:202010-01 + changelog_nightly: + docker: + - image: quay.io/influxdb/changelogger:250bf04063b97d5cbad31e1a18ac479fc123788b steps: - checkout - - install_rust - run: - name: Run script + name: Generate changelog command: | - set -x - git clone --depth=1 --branch v0.2.5 https://github.com/orhun/git-cliff - cd git-cliff - cargo install git-cliff - cd .. + mkdir changelog_artifacts/CHANGELOG.md - S3_PATH="https://s3.amazonaws.com/dl.influxdata.com/platform/nightlies/master-1.x" - curl -o CHANGELOG.md ${S3_PATH}/CHANGELOG.md - curl -o scripts/ci/changelog-commit.txt ${S3_PATH}/changelog-commit.txt + if [[ "<< pipeline.git.branch >>" == "master-1.x" ]] ; then + echo "CHANGELOG for master-1.x commit ${CIRCLE_SHA1}\n\n" > changelog_artifacts/CHANGELOG.md + LATEST_19X="$(git tag | grep '^v1\.9\.[0-9]*$' | sort -V | tail -1)" - TIMESTAMP="$(date -u '+%Y%m%d')" - COMMIT_FILE_PATH="scripts/ci/changelog-commit.txt" - LAST_COMMIT=$(cat $COMMIT_FILE_PATH) - NEWEST_COMMIT=${CIRCLE_SHA1} - ./scripts/ci/update-changelog.sh \ - --commit-range "$LAST_COMMIT..$NEWEST_COMMIT" \ - --prepend CHANGELOG.md \ - -- \ - --tag $TIMESTAMP - echo ${CIRCLE_SHA1} > $COMMIT_FILE_PATH + # build 1.9.0 to 1.9.x changelog, plus unreleased from master + build-multibranch-changelog.sh HEAD "$LATEST_19X" v1.9.0 >> changelog_artifacts/CHANGELOG.md - mkdir changelog_artifacts - cp CHANGELOG.md changelog_artifacts - cp $COMMIT_FILE_PATH changelog_artifacts + elif [[ "<< pipeline.git.branch >>" == "1.9" ]] ; then + echo "CHANGELOG for 1.9 branch\n\n" > changelog_artifacts/CHANGELOG.md + + # build 1.9.0 to current 1.9 changelog + build-simple-changelog.sh HEAD v1.9.0 >> changelog_artifacts/CHANGELOG.md + + fi + + cat ./scripts/ci/scripts/ci/CHANGELOG_frozen.md >> changelog_artifacts/CHANGELOG.md - store_artifacts: path: changelog_artifacts/ - - aws-s3/copy: - arguments: | - --acl public-read - aws-region: AWS_S3_REGION - from: changelog_artifacts/changelog-commit.txt - to: s3://dl.influxdata.com/platform/nightlies/master-1.x/changelog-commit.txt - aws-s3/copy: arguments: | --acl public-read aws-region: AWS_S3_REGION from: changelog_artifacts/CHANGELOG.md - to: s3://dl.influxdata.com/platform/nightlies/master-1.x/CHANGELOG.md + to: s3://dl.influxdata.com/platform/nightlies/<< pipeline.git.branch >>/CHANGELOG.md workflows: version: 2.1 @@ -224,7 +211,7 @@ workflows: - "master-1.x" - "1.9" jobs: - - changelog + - changelog_nightly - static_code_checks - fluxtest - unit_test @@ -232,7 +219,7 @@ workflows: - unit_test_race - build_binaries: requires: - - changelog + - changelog_nightly - static_code_checks - fluxtest - unit_test diff --git a/CHANGELOG_OLD.md b/scripts/ci/CHANGELOG_frozen.md similarity index 98% rename from CHANGELOG_OLD.md rename to scripts/ci/CHANGELOG_frozen.md index 2d6df225dc..78aeaf8da1 100644 --- a/CHANGELOG_OLD.md +++ b/scripts/ci/CHANGELOG_frozen.md @@ -1,48 +1,3 @@ -[unreleased] - -### Features - -- [#21707](https://github.com/influxdata/influxdb/pull/21707): chore: add logging to compaction -- [#21752](https://github.com/influxdata/influxdb/pull/21752): feat: add total-buffer-bytes config parameter to subscriptions -- [#21820](https://github.com/influxdata/influxdb/pull/21820): chore: update flux to v0.120.1 -- [#21983](https://github.com/influxdata/influxdb/pull/21983): feat: SHOW TAG VALUES should produce results from one specific RP -- [#22020](https://github.com/influxdata/influxdb/pull/22020): feat: add subscription buffer size usage metric -- [#22097](https://github.com/influxdata/influxdb/pull/22097): chore: update flux dependency to 0.124.0 - -### Bugfixes - -- [#21592](https://github.com/influxdata/influxdb/pull/21592): fix: avoid rewriting fields.idx unnecessarily -- [#21659](https://github.com/influxdata/influxdb/pull/21659): fix: do not close connection twice in DigestWithOptions -- [#21666](https://github.com/influxdata/influxdb/pull/21666): fix: do not panic on cleaning up failed iterators -- [#21693](https://github.com/influxdata/influxdb/pull/21693): fix: don't access a field in a nil struct -- [#21558](https://github.com/influxdata/influxdb/pull/21558): fix: do not send non-UTF-8 characters to subscriptions -- [#21792](https://github.com/influxdata/influxdb/pull/21792): fix: error instead of panic for statement rewrite failure -- [#21795](https://github.com/influxdata/influxdb/pull/21795): fix: show shards gives empty expiry time for inf duration shards -- [#21843](https://github.com/influxdata/influxdb/pull/21843): fix: hard limit on field size while parsing line protocol -- [#21895](https://github.com/influxdata/influxdb/pull/21895): fix: systemd unit should block on startup until http endpoint is ready -- [#21863](https://github.com/influxdata/influxdb/pull/21863): fix: export example and fix adjacent shards -- [#21934](https://github.com/influxdata/influxdb/pull/21934): chore: use community maintained golang-jwt -- [#21943](https://github.com/influxdata/influxdb/pull/21943): fix: tsi index should compact old or too-large log files -- [#22006](https://github.com/influxdata/influxdb/pull/22006): fix: old tsl files should be compacted without new writes -- [#21947](https://github.com/influxdata/influxdb/pull/21947): fix: prevent silently dropped writes with overlapping shards -- [#21978](https://github.com/influxdata/influxdb/pull/21978): fix: restore portable backup bug -- [#21992](https://github.com/influxdata/influxdb/pull/21992): fix: systemd-start script should be executable by group and others -- [#22019](https://github.com/influxdata/influxdb/pull/22019): fix: error instead of panic when enterprise tries to restore with OSS -- [#22040](https://github.com/influxdata/influxdb/pull/22040): fix: copy names from mmapped memory before closing iterator -- [#22106](https://github.com/influxdata/influxdb/pull/22106): fix: ensure log formatting (JSON) is respected -- [#22090](https://github.com/influxdata/influxdb/pull/22090): fix: systemd service -- handle https, 40x, and block indefinitely -- [#22195](https://github.com/influxdata/influxdb/pull/22195): fix: avoid compaction queue stats flutter -- [#22283](https://github.com/influxdata/influxdb/pull/22283): fix: require database authorization to see continuous queries -- [#22273](https://github.com/influxdata/influxdb/pull/22273): fix: return correct count of ErrNotExecuted -- [#22338](https://github.com/influxdata/influxdb/pull/22338): fix: TSI logfile race -- [#22348](https://github.com/influxdata/influxdb/pull/22348): fix: flux error properly read by cloud -- [#22229](https://github.com/influxdata/influxdb/pull/22229): fix: influxdb packages should depend on curl bc of use in systemd script - -v1.9.2 [unreleased] -- [#21631](https://github.com/influxdata/influxdb/pull/21631): fix: group by returns multiple results per group in some circumstances - -v1.9.1 [unreleased] - v1.9.0 [unreleased] ### Features