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

feat(workflow): update directory structure #520

Merged
merged 3 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ websocket:
- changed-files:
- any-glob-to-any-file: websocket/**/*

worker:
workflow:
- changed-files:
- any-glob-to-any-file: worker/**/*
- any-glob-to-any-file: workflow/**/*
23 changes: 10 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
outputs:
ui: ${{ steps.ui.outputs.any_changed }}
api: ${{ steps.api.outputs.any_changed }}
worker: ${{ steps.worker.outputs.any_changed }}
workflow: ${{ steps.workflow.outputs.any_changed }}
websocket: ${{ steps.websocket.outputs.any_changed }}
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -50,17 +50,14 @@ jobs:
.github/workflows/ci_websocket.yml
CHANGELOG.md

- name: changed files for worker
id: worker
- name: changed files for workflow
id: workflow
uses: tj-actions/changed-files@v41
with:
files: |
worker/crates/**
worker/tests/**
worker/Cargo.toml
worker/Cargo.lock
workflow/**
.github/workflows/ci.yml
.github/workflows/ci_worker.yml
.github/workflows/ci_workflow.yml
CHANGELOG.md
ci-api:
needs: prepare
Expand All @@ -74,17 +71,17 @@ jobs:
needs: prepare
if: needs.prepare.outputs.websocket == 'true'
uses: ./.github/workflows/ci_websocket.yml
ci-worker:
ci-workflow:
needs: prepare
if: needs.prepare.outputs.worker == 'true'
uses: ./.github/workflows/ci_worker.yml
if: needs.prepare.outputs.workflow == 'true'
uses: ./.github/workflows/ci_workflow.yml
ci:
runs-on: ubuntu-latest
needs:
- ci-api
- ci-ui
- ci-websocket
- ci-worker
- ci-workflow
if: '!failure()'
steps:
- run: echo OK
Expand Down Expand Up @@ -145,7 +142,7 @@ jobs:
new_tag_short: ${{ needs.ci-collect-info.outputs.new_tag_short }}
name: ${{ needs.ci-collect-info.outputs.name }}
sha: ${{ github.sha }}

build-ui:
needs:
- ci
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ci-worker
name: ci-workflow

on:
workflow_call:
Expand All @@ -17,7 +17,7 @@ env:

defaults:
run:
working-directory: worker
working-directory: workflow

jobs:
ci:
Expand All @@ -30,8 +30,8 @@ jobs:
- name: Cache cargo registry
uses: Swatinem/rust-cache@v2
with:
workspaces: worker
shared-key: "worker-ci"
workspaces: workflow
shared-key: "workflow-ci"
- name: install required tools
uses: taiki-e/install-action@v2
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release_quality_checker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
node-version: lts/*

- name: get version
working-directory: ./worker/tools/plateau-gis-quality-checker
working-directory: ./workflow/plateau-gis-quality-checker
run: echo "PACKAGE_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV

- name: create release
Expand Down Expand Up @@ -100,17 +100,17 @@ jobs:
- name: enable corepack
run: |
corepack enable
working-directory: ./worker/tools/plateau-gis-quality-checker
working-directory: ./workflow/plateau-gis-quality-checker

- name: install frontend dependencies
run: yarn install
working-directory: ./worker/tools/plateau-gis-quality-checker
working-directory: ./workflow/plateau-gis-quality-checker

- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
projectPath: ./worker/tools/plateau-gis-quality-checker
projectPath: ./workflow/plateau-gis-quality-checker
releaseId: ${{ needs.create-release.outputs.release_id }}
args: ${{ matrix.settings.args }}

Expand Down
5 changes: 0 additions & 5 deletions worker/.gitattributes

This file was deleted.

23 changes: 0 additions & 23 deletions worker/compose.yml

This file was deleted.

34 changes: 0 additions & 34 deletions worker/containers/compose/otel-collector/config.yaml

This file was deleted.

Empty file.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions workflow/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
runtime/examples/plateau/testdata/**/* linguist-vendored
tests/fixture/**/* linguist-vendored
tools/cesium/**/* linguist-vendored
tools/mvt/**/* linguist-vendored
plateau-gis-quality-checker/src-tauri/embed/**/* linguist-vendored
File renamed without changes.
8 changes: 4 additions & 4 deletions worker/.taplo.toml → workflow/.taplo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# https://taplo.tamasfe.dev/configuration/formatter-options.html
include = [
"Cargo.toml",
"crates/*/Cargo.toml",
"examples/Cargo.toml",
"tests/Cargo.toml",
"tools/plateau-gis-quality-checker/src-tauri/Cargo.toml",
"runtime/*/Cargo.toml",
"cli/Cargo.toml",
"worker/Cargo.toml",
"plateau-gis-quality-checker/src-tauri/Cargo.toml",
]

[formatting]
Expand Down
35 changes: 35 additions & 0 deletions worker/Cargo.lock → workflow/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 20 additions & 21 deletions worker/Cargo.toml → workflow/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[workspace]
members = [
"crates/*",
"examples",
"tests",
"tools/plateau-gis-quality-checker/src-tauri",
"runtime/*",
"cli",
"plateau-gis-quality-checker/src-tauri",
"worker",
]

default-members = ["crates/*"]
default-members = ["runtime/*"]

resolver = "2"

Expand Down Expand Up @@ -45,22 +45,21 @@ inherits = "release"
lto = "fat"

[workspace.dependencies]
reearth-flow-action-log = { path = "crates/action-log" }
reearth-flow-action-plateau-processor = { path = "crates/action-plateau-processor" }
reearth-flow-action-processor = { path = "crates/action-processor" }
reearth-flow-action-sink = { path = "crates/action-sink" }
reearth-flow-action-source = { path = "crates/action-source" }
reearth-flow-cli = { path = "crates/cli" }
reearth-flow-common = { path = "crates/common" }
reearth-flow-eval-expr = { path = "crates/eval-expr" }
reearth-flow-geometry = { path = "crates/geometry" }
reearth-flow-macros = { path = "crates/macros" }
reearth-flow-runner = { path = "crates/runner" }
reearth-flow-runtime = { path = "crates/runtime" }
reearth-flow-state = { path = "crates/state" }
reearth-flow-storage = { path = "crates/storage" }
reearth-flow-telemetry = { path = "crates/telemetry" }
reearth-flow-types = { path = "crates/types" }
reearth-flow-action-log = { path = "runtime/action-log" }
reearth-flow-action-plateau-processor = { path = "runtime/action-plateau-processor" }
reearth-flow-action-processor = { path = "runtime/action-processor" }
reearth-flow-action-sink = { path = "runtime/action-sink" }
reearth-flow-action-source = { path = "runtime/action-source" }
reearth-flow-common = { path = "runtime/common" }
reearth-flow-eval-expr = { path = "runtime/eval-expr" }
reearth-flow-geometry = { path = "runtime/geometry" }
reearth-flow-macros = { path = "runtime/macros" }
reearth-flow-runner = { path = "runtime/runner" }
reearth-flow-runtime = { path = "runtime/runtime" }
reearth-flow-state = { path = "runtime/state" }
reearth-flow-storage = { path = "runtime/storage" }
reearth-flow-telemetry = { path = "runtime/telemetry" }
reearth-flow-types = { path = "runtime/types" }
miseyu marked this conversation as resolved.
Show resolved Hide resolved

nusamai-citygml = { git = "https://github.com/reearth/plateau-gis-converter", tag = "v0.0.1-rc8", features = ["serde", "serde_json"] }
nusamai-geometry = { git = "https://github.com/reearth/plateau-gis-converter", tag = "v0.0.1-rc8", features = ["serde"] }
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion worker/crates/cli/Cargo.toml → workflow/cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
description = "Re:Earth Flow cli library"
description = "Re:Earth Flow cli"
name = "reearth-flow-cli"

authors.workspace = true
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.
Loading
Loading