Skip to content

Commit

Permalink
some ci changes and templates needed update
Browse files Browse the repository at this point in the history
  • Loading branch information
j4qfrost committed May 21, 2024
1 parent bbc43c4 commit 1941f8c
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
branch: master
- 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
echo "release_tag=v`cat pubspec.yaml | sed -nre 's/^version: [^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p'`" >> $GITHUB_ENV
- name: Release
uses: softprops/action-gh-release@v1
with:
Expand Down
8 changes: 4 additions & 4 deletions ci/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: "3.3"

services:
postgres:
image: postgres:14.5
image: postgres:16.2
# command: -c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key
container_name: conduit_postgres
restart: always
Expand All @@ -14,5 +14,5 @@ services:
ports:
- 0.0.0.0:15432:5432
volumes:
- ./ssl/server.crt:/var/lib/postgresql/server.crt:ro
- ./ssl/server.key:/var/lib/postgresql/server.key:ro
- ./ssl/server.crt:/var/lib/postgresql/server.crt:ro
- ./ssl/server.key:/var/lib/postgresql/server.key:ro
8 changes: 4 additions & 4 deletions packages/cli/templates/db/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ environment:
sdk: ">=3.4.0 <4.0.0"

dependencies:
conduit: ^5.0.1
conduit_core: ^5.0.1
conduit_postgresql: ^5.0.1
conduit: ^5.1.0
conduit_core: ^5.1.0
conduit_postgresql: ^5.1.0

dev_dependencies:
test: ^1.25.2
conduit_test: ^5.0.1
conduit_test: ^5.1.0
9 changes: 5 additions & 4 deletions packages/cli/templates/db_and_auth/lib/channel.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:wildfire/controller/register_controller.dart';
import 'package:wildfire/controller/user_controller.dart';
import 'package:wildfire/model/user.dart';
import 'package:wildfire/utility/html_template.dart';

import 'package:wildfire/wildfire.dart';

/// This type initializes an application.
Expand All @@ -12,7 +13,7 @@ import 'package:wildfire/wildfire.dart';
class WildfireChannel extends ApplicationChannel
implements AuthRedirectControllerDelegate {
final HTMLRenderer htmlRenderer = HTMLRenderer();
late final authServer;
late final AuthServer authServer;
late ManagedContext context;

/// Initialize services in this method.
Expand Down Expand Up @@ -55,19 +56,19 @@ class WildfireChannel extends ApplicationChannel
router
.route("/register")
.link(() => Authorizer.basic(authServer))!
.link(() => RegisterController(context!, authServer));
.link(() => RegisterController(context, authServer));

/* Gets profile for user with bearer token */
router
.route("/me")
.link(() => Authorizer.bearer(authServer))!
.link(() => IdentityController(context!));
.link(() => IdentityController(context));

/* Gets all users or one specific user by id */
router
.route("/users/[:id]")
.link(() => Authorizer.bearer(authServer))!
.link(() => UserController(context!, authServer));
.link(() => UserController(context, authServer));

return router;
}
Expand Down
8 changes: 4 additions & 4 deletions packages/cli/templates/db_and_auth/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ environment:
sdk: ">=3.4.0 <4.0.0"

dependencies:
conduit: ^5.0.1
conduit_core: ^5.0.1
conduit_postgresql: ^5.0.1
conduit: ^5.1.0
conduit_core: ^5.1.0
conduit_postgresql: ^5.1.0

dev_dependencies:
test: ^1.25.2
conduit_test: ^5.0.1
conduit_test: ^5.1.0
6 changes: 3 additions & 3 deletions packages/cli/templates/default/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ environment:
sdk: ">=3.4.0 <4.0.0"

dependencies:
conduit: ^5.0.1
conduit_core: ^5.0.1
conduit: ^5.1.0
conduit_core: ^5.1.0

dev_dependencies:
test: ^1.25.2
conduit_test: ^5.0.1
conduit_test: ^5.1.0
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: conduit_workspace
version: 5.1.0
version: 5.1.1
home: https://www.theconduit.dev
repository: https://github.com/conduit-dart/conduit
issue_tracker: https://github.com/conduit-dart/conduit/issues
Expand Down

0 comments on commit 1941f8c

Please sign in to comment.