Skip to content

Commit

Permalink
Refactor: housekeeping 2 20 24 (#216)
Browse files Browse the repository at this point in the history
* CI fixes and postgres upgrade

* add sdk version to smokes

* parent versioning

* sync versions

* postgres version upgrade
  • Loading branch information
j4qfrost authored Feb 27, 2024
1 parent 1f51879 commit 0d5612c
Show file tree
Hide file tree
Showing 99 changed files with 767 additions and 467 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
|| (github.event.pull_request.merged && startsWith(github.head_ref, 'docs/'))
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dart-lang/setup-dart@v1
with:
sdk: stable
Expand Down
19 changes: 12 additions & 7 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,19 @@ concurrency:

jobs:
smoke:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
matrix:
sdk: [stable, main]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dart-lang/setup-dart@v1
with:
sdk: dev
sdk: ${{ matrix.sdk }}
- name: Setup Conduit
run: |
dart pub global activate -spath packages/cli
dart pub global activate melos
dart pub global activate -spath packages/cli
melos cache-source
- name: Run tests
working-directory: ../
Expand All @@ -36,10 +39,12 @@ jobs:
startsWith(github.head_ref, 'feature/')
|| startsWith(github.head_ref, 'fix/')
|| startsWith(github.head_ref, 'refactor/')
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
runner_args: [melos test-unit, dart tool/generated_test_runner.dart]
sdk: [stable, main]
env:
TEST_DIR: packages/core
services:
Expand All @@ -54,10 +59,10 @@ jobs:
ports:
- 15432:5432
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dart-lang/setup-dart@v1
with:
sdk: dev
sdk: ${{ matrix.sdk }}
- name: Get Dependencies
run: |
dart pub global activate -spath packages/cli
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,18 @@ concurrency:
jobs:
smoke:
runs-on: macos-latest
strategy:
matrix:
sdk: [stable, main]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dart-lang/setup-dart@v1
with:
sdk: dev
sdk: ${{ matrix.sdk }}
- name: Setup Conduit
run: |
dart pub global activate -spath packages/cli
dart pub global activate melos
dart pub global activate -spath packages/cli
melos cache-source
- name: Run tests
working-directory: ../
Expand All @@ -38,8 +41,10 @@ jobs:
|| startsWith(github.head_ref, 'refactor/')
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
runner_args: [melos test-unit, dart tool/generated_test_runner.dart]
sdk: [stable, main]
env:
TEST_DIR: packages/core
POSTGRES_HOST: localhost
Expand All @@ -64,10 +69,10 @@ jobs:
createuser -s -e -g postgres ${{ env.POSTGRES_USER }}
psql --command="ALTER USER ${{ env.POSTGRES_USER }} WITH PASSWORD '${{ env.POSTGRES_PASSWORD }}'"
createdb --owner=${{ env.POSTGRES_USER }} ${{ env.POSTGRES_DB }}
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dart-lang/setup-dart@v1
with:
sdk: dev
sdk: ${{ matrix.sdk }}
- name: Get Dependencies
run: |
dart pub global activate -spath packages/cli
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
|| startsWith(github.event.head_commit.message, 'revert')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dart-lang/setup-dart@v1
with:
sdk: stable
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Format
run: dart fix --apply && dart format --fix .
- name: Uptick versions
run: melos version --yes
run: melos sync-version
- name: Changelog
run: git diff --unified=0 $GITHUB_SHA packages/cli/CHANGELOG.md | tail +6 | sed -e 's/^\+//' > CHANGES.txt
- name: Cache Source
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
|| startsWith(github.event.head_commit.message, 'revert')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Compute the release tag
run: |
echo "release_tag=v`cat packages/cli/pubspec.yaml | sed -nre 's/^version: [^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p'`" >> $GITHUB_ENV
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@ jobs:
smoke:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dart-lang/setup-dart@v1
with:
sdk: dev
- name: Setup Conduit
run: |
dart pub global activate -spath packages/cli
dart pub global activate melos
dart pub global run melos:melos cache-source-win
dart pub global activate -spath packages/cli
- name: Run tests
working-directory: ../
run: |
Expand All @@ -38,6 +37,7 @@ jobs:
|| startsWith(github.head_ref, 'refactor/')
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
runner_args: [melos test-unit, dart tool/generated_test_runner.dart]
env:
Expand Down
168 changes: 168 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 2023-11-22

### Changes

---

Packages with breaking changes:

- [`conduit` - `v4.4.0`](#conduit---v4310)
- [`conduit_codable` - `v4.3.8`](#conduit_codable---v438)
- [`conduit_common` - `v4.3.8`](#conduit_common---v438)
- [`conduit_config` - `v4.3.8`](#conduit_config---v438)
- [`conduit_isolate_exec` - `v4.3.8`](#conduit_isolate_exec---v438)
- [`conduit_open_api` - `v4.3.8`](#conduit_open_api---v438)
- [`conduit_password_hash` - `v4.3.8`](#conduit_password_hash---v438)
- [`conduit_runtime` - `v4.3.8`](#conduit_runtime---v438)
- [`conduit_test` - `v4.3.8`](#conduit_test---v438)
- [`fs_test_agent` - `v4.3.8`](#fs_test_agent---v438)

Packages with other changes:

- [`conduit_core` - `v4.4.0`](#conduit_core---v440)
- [`conduit_postgresql` - `v4.4.0`](#conduit_postgresql---v440)

Packages graduated to a stable release (see pre-releases prior to the stable version for changelog entries):

- `conduit` - `v4.4.0`
- `conduit_codable` - `v4.3.8`
- `conduit_common` - `v4.3.8`
- `conduit_config` - `v4.3.8`
- `conduit_core` - `v4.4.0`
- `conduit_isolate_exec` - `v4.3.8`
- `conduit_open_api` - `v4.3.8`
- `conduit_password_hash` - `v4.3.8`
- `conduit_postgresql` - `v4.4.0`
- `conduit_runtime` - `v4.3.8`
- `conduit_test` - `v4.3.8`
- `fs_test_agent` - `v4.3.8`

---

#### `conduit` - `v4.4.0`

#### `conduit_codable` - `v4.3.8`

#### `conduit_common` - `v4.3.8`

#### `conduit_config` - `v4.3.8`

#### `conduit_isolate_exec` - `v4.3.8`

#### `conduit_open_api` - `v4.3.8`

#### `conduit_password_hash` - `v4.3.8`

#### `conduit_runtime` - `v4.3.8`

#### `conduit_test` - `v4.3.8`

#### `fs_test_agent` - `v4.3.8`

#### `conduit_core` - `v4.4.0`

#### `conduit_postgresql` - `v4.4.0`


## 2023-11-22

### Changes

---

Packages with breaking changes:

- There are no breaking changes in this release.

Packages with other changes:

- [`conduit` - `v4.4.0-dev.0`](#conduit---v4310-dev0)
- [`conduit_codable` - `v4.3.8-dev.0`](#conduit_codable---v438-dev0)
- [`conduit_common` - `v4.3.8-dev.0`](#conduit_common---v438-dev0)
- [`conduit_config` - `v4.3.8-dev.0`](#conduit_config---v438-dev0)
- [`conduit_core` - `v4.4.0-dev.0`](#conduit_core---v440-dev0)
- [`conduit_isolate_exec` - `v4.3.8-dev.0`](#conduit_isolate_exec---v438-dev0)
- [`conduit_open_api` - `v4.3.8-dev.0`](#conduit_open_api---v438-dev0)
- [`conduit_password_hash` - `v4.3.8-dev.0`](#conduit_password_hash---v438-dev0)
- [`conduit_postgresql` - `v4.4.0-dev.0`](#conduit_postgresql---v440-dev0)
- [`conduit_runtime` - `v4.3.8-dev.0`](#conduit_runtime---v438-dev0)
- [`conduit_test` - `v4.3.8-dev.0`](#conduit_test---v438-dev0)
- [`fs_test_agent` - `v4.3.8-dev.0`](#fs_test_agent---v438-dev0)

---

#### `conduit` - `v4.4.0-dev.0`

- **REFACTOR**(postgres): BREAKING CHANGE major release for postgres driver. ([d6bf1165](https://github.com/conduit-dart/conduit/commit/d6bf1165f6903cb133b1ec4bf3d66242646f548b))
- **FIX**: Melos stuff ([#199](https://github.com/conduit-dart/conduit/issues/199)). ([20bc466d](https://github.com/conduit-dart/conduit/commit/20bc466daea0f82019aaf4c04edeab64a83038f9))

#### `conduit_codable` - `v4.3.8-dev.0`

- **REFACTOR**(postgres): BREAKING CHANGE major release for postgres driver. ([d6bf1165](https://github.com/conduit-dart/conduit/commit/d6bf1165f6903cb133b1ec4bf3d66242646f548b))
- **REFACTOR**: House Keeping July 22. ([cf1eb45e](https://github.com/conduit-dart/conduit/commit/cf1eb45e035a202a97c6baab3348c030a667628b))
- **FIX**: Melos stuff ([#199](https://github.com/conduit-dart/conduit/issues/199)). ([20bc466d](https://github.com/conduit-dart/conduit/commit/20bc466daea0f82019aaf4c04edeab64a83038f9))

#### `conduit_common` - `v4.3.8-dev.0`

- **REFACTOR**(postgres): BREAKING CHANGE major release for postgres driver. ([d6bf1165](https://github.com/conduit-dart/conduit/commit/d6bf1165f6903cb133b1ec4bf3d66242646f548b))
- **REFACTOR**: House Keeping July 22. ([cf1eb45e](https://github.com/conduit-dart/conduit/commit/cf1eb45e035a202a97c6baab3348c030a667628b))
- **FIX**: Melos stuff ([#199](https://github.com/conduit-dart/conduit/issues/199)). ([20bc466d](https://github.com/conduit-dart/conduit/commit/20bc466daea0f82019aaf4c04edeab64a83038f9))

#### `conduit_config` - `v4.3.8-dev.0`

- **REFACTOR**(postgres): BREAKING CHANGE major release for postgres driver. ([d6bf1165](https://github.com/conduit-dart/conduit/commit/d6bf1165f6903cb133b1ec4bf3d66242646f548b))
- **REFACTOR**: House Keeping July 22. ([cf1eb45e](https://github.com/conduit-dart/conduit/commit/cf1eb45e035a202a97c6baab3348c030a667628b))
- **FIX**: Melos stuff ([#199](https://github.com/conduit-dart/conduit/issues/199)). ([20bc466d](https://github.com/conduit-dart/conduit/commit/20bc466daea0f82019aaf4c04edeab64a83038f9))

#### `conduit_core` - `v4.4.0-dev.0`

- **REFACTOR**(postgres): BREAKING CHANGE major release for postgres driver. ([d6bf1165](https://github.com/conduit-dart/conduit/commit/d6bf1165f6903cb133b1ec4bf3d66242646f548b))
- **FIX**: Melos stuff ([#199](https://github.com/conduit-dart/conduit/issues/199)). ([20bc466d](https://github.com/conduit-dart/conduit/commit/20bc466daea0f82019aaf4c04edeab64a83038f9))
- **FEAT**: sort predicate ([#203](https://github.com/conduit-dart/conduit/issues/203)). ([1f51879c](https://github.com/conduit-dart/conduit/commit/1f51879c26a37e4671206a79b2f319629173f046))

#### `conduit_isolate_exec` - `v4.3.8-dev.0`

- **REFACTOR**(postgres): BREAKING CHANGE major release for postgres driver. ([d6bf1165](https://github.com/conduit-dart/conduit/commit/d6bf1165f6903cb133b1ec4bf3d66242646f548b))
- **FIX**: Melos stuff ([#199](https://github.com/conduit-dart/conduit/issues/199)). ([20bc466d](https://github.com/conduit-dart/conduit/commit/20bc466daea0f82019aaf4c04edeab64a83038f9))

#### `conduit_open_api` - `v4.3.8-dev.0`

- **REFACTOR**(postgres): BREAKING CHANGE major release for postgres driver. ([d6bf1165](https://github.com/conduit-dart/conduit/commit/d6bf1165f6903cb133b1ec4bf3d66242646f548b))
- **REFACTOR**: House Keeping July 22. ([cf1eb45e](https://github.com/conduit-dart/conduit/commit/cf1eb45e035a202a97c6baab3348c030a667628b))
- **FIX**: Melos stuff ([#199](https://github.com/conduit-dart/conduit/issues/199)). ([20bc466d](https://github.com/conduit-dart/conduit/commit/20bc466daea0f82019aaf4c04edeab64a83038f9))

#### `conduit_password_hash` - `v4.3.8-dev.0`

- **REFACTOR**(postgres): BREAKING CHANGE major release for postgres driver. ([d6bf1165](https://github.com/conduit-dart/conduit/commit/d6bf1165f6903cb133b1ec4bf3d66242646f548b))
- **REFACTOR**: House Keeping July 22. ([cf1eb45e](https://github.com/conduit-dart/conduit/commit/cf1eb45e035a202a97c6baab3348c030a667628b))
- **FIX**: Melos stuff ([#199](https://github.com/conduit-dart/conduit/issues/199)). ([20bc466d](https://github.com/conduit-dart/conduit/commit/20bc466daea0f82019aaf4c04edeab64a83038f9))

#### `conduit_postgresql` - `v4.4.0-dev.0`

- **REFACTOR**(postgres): BREAKING CHANGE major release for postgres driver. ([d6bf1165](https://github.com/conduit-dart/conduit/commit/d6bf1165f6903cb133b1ec4bf3d66242646f548b))
- **REFACTOR**: House Keeping July 22. ([cf1eb45e](https://github.com/conduit-dart/conduit/commit/cf1eb45e035a202a97c6baab3348c030a667628b))
- **FIX**: Melos stuff ([#199](https://github.com/conduit-dart/conduit/issues/199)). ([20bc466d](https://github.com/conduit-dart/conduit/commit/20bc466daea0f82019aaf4c04edeab64a83038f9))
- **FEAT**: sort predicate ([#203](https://github.com/conduit-dart/conduit/issues/203)). ([1f51879c](https://github.com/conduit-dart/conduit/commit/1f51879c26a37e4671206a79b2f319629173f046))

#### `conduit_runtime` - `v4.3.8-dev.0`

- **REFACTOR**(postgres): BREAKING CHANGE major release for postgres driver. ([d6bf1165](https://github.com/conduit-dart/conduit/commit/d6bf1165f6903cb133b1ec4bf3d66242646f548b))
- **REFACTOR**: House Keeping July 22. ([cf1eb45e](https://github.com/conduit-dart/conduit/commit/cf1eb45e035a202a97c6baab3348c030a667628b))
- **FIX**: Melos stuff ([#199](https://github.com/conduit-dart/conduit/issues/199)). ([20bc466d](https://github.com/conduit-dart/conduit/commit/20bc466daea0f82019aaf4c04edeab64a83038f9))

#### `conduit_test` - `v4.3.8-dev.0`

- **REFACTOR**(postgres): BREAKING CHANGE major release for postgres driver. ([d6bf1165](https://github.com/conduit-dart/conduit/commit/d6bf1165f6903cb133b1ec4bf3d66242646f548b))
- **FIX**: Melos stuff ([#199](https://github.com/conduit-dart/conduit/issues/199)). ([20bc466d](https://github.com/conduit-dart/conduit/commit/20bc466daea0f82019aaf4c04edeab64a83038f9))

#### `fs_test_agent` - `v4.3.8-dev.0`

- **REFACTOR**(postgres): BREAKING CHANGE major release for postgres driver. ([d6bf1165](https://github.com/conduit-dart/conduit/commit/d6bf1165f6903cb133b1ec4bf3d66242646f548b))
- **REFACTOR**: House Keeping July 22. ([cf1eb45e](https://github.com/conduit-dart/conduit/commit/cf1eb45e035a202a97c6baab3348c030a667628b))
- **FIX**: Melos stuff ([#199](https://github.com/conduit-dart/conduit/issues/199)). ([20bc466d](https://github.com/conduit-dart/conduit/commit/20bc466daea0f82019aaf4c04edeab64a83038f9))

14 changes: 7 additions & 7 deletions melos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ scripts:
run: melos exec -- "mkdir -p '$PUB_CACHE/hosted/pub.dev/\$MELOS_PACKAGE_NAME-\$MELOS_PACKAGE_VERSION' && cp -rf '\$MELOS_PACKAGE_PATH'/* '$PUB_CACHE/hosted/pub.dev/\$MELOS_PACKAGE_NAME-\$MELOS_PACKAGE_VERSION'"
select-pacakge:
no-private: true
cache-source-win:
run: melos exec -- "mkdir %PUB_CACHE%hosted\pub.dev\%MELOS_PACKAGE_NAME%-%MELOS_PACKAGE_VERSION% && xcopy %MELOS_PACKAGE_PATH% %PUB_CACHE%hosted\pub.dev\%MELOS_PACKAGE_NAME%-%MELOS_PACKAGE_VERSION% /Y /s /e"
select-pacakge:
no-private: true
# cache-source-win:
# run: melos exec -- mkdir %PUB_CACHE%/hosted\pub.dev\%MELOS_PACKAGE_NAME%-%MELOS_PACKAGE_VERSION% && melos exec -- xcopy %MELOS_PACKAGE_PATH% %PUB_CACHE%/hosted\pub.dev\%MELOS_PACKAGE_NAME%-%MELOS_PACKAGE_VERSION% /Y /s /e
# select-pacakge:
# no-private: true
hard-clean:
run: melos exec -- "rm -rf '\$MELOS_PACKAGE_PATH/.dart_tool' '\$MELOS_PACKAGE_PATH/pubspec.lock'"
gen-docs:
Expand All @@ -45,8 +45,8 @@ scripts:
no-private: true
fix:
run: melos exec --fail-fast --ignore "*common*" --ignore "*application*" --ignore "*dependency*" -- "dart fix --apply ."
select-pacakge:
no-private: true
sync-version:
run: melos exec --fail-fast --ignore "*common*" --ignore "*application*" --ignore "*dependency*" -- melos version -y -V MELOS_PACKAGE_NAME:`dart pub deps -s list | grep conduit_workspace | awk '{print $2}' | grep -oE '[0-9]+\.[0-9]+\.[0-9]+'`
environment:
sdk: ">=3.0.1 <4.0.0"
sdk: ">=3.3.0 <4.0.0"

9 changes: 9 additions & 0 deletions packages/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
## 4.4.0

- Graduate package to a stable release. See pre-releases prior to this version for changelog entries.

## 4.4.0-dev.0

- **REFACTOR**(postgres): BREAKING CHANGE major release for postgres driver. ([d6bf1165](https://github.com/conduit-dart/conduit/commit/d6bf1165f6903cb133b1ec4bf3d66242646f548b))
- **FIX**: Melos stuff ([#199](https://github.com/conduit-dart/conduit/issues/199)). ([20bc466d](https://github.com/conduit-dart/conduit/commit/20bc466daea0f82019aaf4c04edeab64a83038f9))

## 4.3.9

- **REFACTOR**: Remove common test. ([cebcc417](https://github.com/conduit-dart/conduit/commit/cebcc417fc2849f18b7e9a2a1bbab412eda621ff))
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/lib/conduit.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
library conduit;

export 'package:conduit_config/conduit_config.dart';
export 'src/migration_source.dart';
export 'package:conduit/src/migration_source.dart';
export 'package:logging/logging.dart';
9 changes: 0 additions & 9 deletions packages/cli/lib/src/commands/build.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import 'dart:mirrors';

import 'package:args/args.dart' as arg_package;
import 'package:conduit/src/command.dart';
import 'package:conduit/src/commands/pub.dart';
import 'package:conduit/src/metadata.dart';
import 'package:conduit/src/mixins/project.dart';
import 'package:conduit_core/conduit_core.dart';
Expand Down Expand Up @@ -44,14 +43,6 @@ class CLIBuild extends CLICommand with CLIProject {
getScriptSource(await getChannelName()),
);

final cfg = await ctx.packageConfig;

final packageNames = cfg.packages
.where((pkg) => pkg.name.startsWith('conduit_'))
.map((pkg) => pkg.name);

await cachePackages(packageNames, projectVersion!.toString());

print("Starting build process...");

final bm = BuildManager(ctx);
Expand Down
Loading

0 comments on commit 0d5612c

Please sign in to comment.