Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename pkgs/sketch_pad => pkgs/dartpad_ui #2955

Merged
merged 2 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .cloud_build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ Cloud Build configuration files for dart-pad and dart-services.

# Contents

- `dart-services.yaml` - Deploys the dart_services server to Cloud Run
- `dart_pad.yaml` - Deploys `sketch_pad` to Firebase Hosting
- `sketch_pad.yaml` - Deploys `sketch_pad` to Firebase Hosting
- `dart_pad.yaml` - Deploys `dartpad_ui` to Firebase Hosting
- `dart_services.yaml` - Deploys the dart_services server to Cloud Run

This folder also has configuration files from [cloud-builders-community][],
which are needed to build and deploy `sketch_pad` to Firebase Hosting:
which are needed to build and deploy `dartpad_ui` to Firebase Hosting:

- `flutter/` - Uploads an image that contains the Flutter SDK to Container Registry
- `firebase/` - Uploads an image that contains the Firebase SDK to Container Registry
Expand Down Expand Up @@ -42,10 +41,10 @@ The substitutions are a comma separated list of `SUBSITUTION=value`:
- `_REDIS_ADDR` - the IP address of the Redis bucket (10.0.0.4:6379)
- `COMMIT_SHA` - the Git commit SHA for this build. Not required when using Triggers.

## Deploy sketch_pad:
## Deploy dartpad_ui:

```bash
gcloud builds submit --config .cloud_build/sketch_pad.yaml
gcloud builds submit --config .cloud_build/dart_pad.yaml
```

## Update Flutter SDK images
Expand Down
4 changes: 2 additions & 2 deletions .cloud_build/dart_pad.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
steps:
- name: gcr.io/$PROJECT_ID/flutter:main
args: ['build', 'web']
dir: pkgs/sketch_pad
dir: pkgs/dartpad_ui
- name: gcr.io/$PROJECT_ID/firebase
args: ['deploy', '--project=$PROJECT_ID', '--only', 'hosting:dartpad']
dir: pkgs/sketch_pad
dir: pkgs/dartpad_ui
7 changes: 0 additions & 7 deletions .cloud_build/sketch_pad.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
**/pubspec.lock linguist-generated=true
pkgs/dart_services/lib/src/shared/** linguist-generated=true
pkgs/sketch_pad/lib/samples.g.dart linguist-generated=true
pkgs/sketch_pad/web/codemirror/** linguist-generated=true
pkgs/dartpad_ui/lib/samples.g.dart linguist-generated=true
pkgs/dartpad_ui/web/codemirror/** linguist-generated=true
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
name: package:sketch_pad
name: package:dartpad_ui

permissions: read-all

on:
push:
branches: [ main ]
paths:
- '.github/workflows/sketch_pad.yml'
- 'pkgs/sketch_pad/**'
- '.github/workflows/dartpad_ui.yml'
- 'pkgs/dartpad_ui/**'
pull_request:
branches: [ main ]
paths:
- '.github/workflows/sketch_pad.yml'
- 'pkgs/sketch_pad/**'
- '.github/workflows/dartpad_ui.yml'
- 'pkgs/dartpad_ui/**'
schedule:
- cron: '0 0 * * 0' # weekly

Expand All @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
defaults:
run:
working-directory: pkgs/sketch_pad/
working-directory: pkgs/dartpad_ui/
steps:
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ and Flutter. You can access it at [dartpad.dev](http://dartpad.dev).

| Package | Description | CI Status |
| --- | --- | --- |
| [sketch_pad](pkgs/sketch_pad/) | The frontend application, built with Flutter | [![sketch_pad](https://github.com/dart-lang/dart-pad/actions/workflows/sketch_pad.yml/badge.svg)](https://github.com/dart-lang/dart-pad/actions/workflows/sketch_pad.yml) |
| [dart_services](pkgs/dart_services/) | The backend service for DartPad. | [![dart_services](https://github.com/dart-lang/dart-pad/actions/workflows/dart_services.yml/badge.svg)](https://github.com/dart-lang/dart-pad/actions/workflows/dart_services.yml) |
| [dartpad_shared](pkgs/dartpad_shared/) | Shared code between the DartPad frontend and backend. | [![dartpad_shared](https://github.com/dart-lang/dart-pad/actions/workflows/dartpad_shared.yml/badge.svg)](https://github.com/dart-lang/dart-pad/actions/workflows/dartpad_shared.yml) |
| [dartpad_ui](pkgs/dartpad_ui/) | The frontend UI for DartPad. | [![dartpad_ui](https://github.com/dart-lang/dart-pad/actions/workflows/dartpad_ui.yml/badge.svg)](https://github.com/dart-lang/dart-pad/actions/workflows/dartpad_ui.yml) |
| [samples](pkgs/samples/) | Sample code snippets for DartPad. | [![samples](https://github.com/dart-lang/dart-pad/actions/workflows/samples.yml/badge.svg)](https://github.com/dart-lang/dart-pad/actions/workflows/samples.yml) |

## Background
Expand Down
1 change: 1 addition & 0 deletions pkgs/dart_services/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ build/
coverage.json
lcov.info
.idea/
pubspec.lock

# Redis snapshot persistance file
dump.rdb
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions pkgs/sketch_pad/pubspec.yaml → pkgs/dartpad_ui/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: sketch_pad
description: An experimental redux of the DartPad UI.
name: dartpad_ui
description: The front-end UI of DartPad.
publish_to: none

environment:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import 'dart:convert';

import 'package:sketch_pad/gists.dart';
import 'package:dartpad_ui/gists.dart';
import 'package:test/test.dart';

void main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.

import 'package:sketch_pad/model.dart';
import 'package:dartpad_ui/model.dart';
import 'package:test/test.dart';

void main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.

import 'package:sketch_pad/samples.g.dart';
import 'package:dartpad_ui/samples.g.dart';
import 'package:test/test.dart';

void main() {
Expand Down
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions pkgs/samples/tool/samples.dart
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class Samples {
print('Wrote ${readme.path}');

// samples.g.dart
final codeFile = File('../sketch_pad/lib/samples.g.dart');
final codeFile = File('../dartpad_ui/lib/samples.g.dart');
final contents = _generateSourceContent();
codeFile.writeAsStringSync(contents);
print('Wrote ${codeFile.path}');
Expand All @@ -114,7 +114,7 @@ class Samples {
final readmeUpToDate =
readme.readAsStringSync() == _generateReadmeContent();

final codeFile = File('../sketch_pad/lib/samples.g.dart');
final codeFile = File('../dartpad_ui/lib/samples.g.dart');
final codeFileUpToDate =
codeFile.readAsStringSync() == _generateSourceContent();

Expand Down
Loading