Skip to content

DO NOT MERGE: All non-upstreamed changes#3

Closed
rskew wants to merge 2 commits intov0.6-branchfrom
all-non-upstreamed-changes
Closed

DO NOT MERGE: All non-upstreamed changes#3
rskew wants to merge 2 commits intov0.6-branchfrom
all-non-upstreamed-changes

Conversation

@rskew
Copy link
Collaborator

@rskew rskew commented Jan 21, 2025

When making a change to Aiko:

  • Make and test your change against upstream master
  • Create a PR from your branch to upstream
  • Cherry-pick your commit onto this branch and update highlighter_all to point to the new tip of this branch

When a change is upstreamed:

  • Merge upstream into this branch
  • Update highlighter_all to point to the new tip of this branch
  • Fix any problems that come from using latest Aiko master in highlighter_all

Current contents of this branch (keep this up-to-date):

This branch branches off v0.6 as this is what we previously used in highlighter_all. There are some changes to make when updating highlighter_all to use latest Aiko master.

A stream creator might pass a queue_response or topic response
when calling create_stream(), so it can be notified
as frames are processed.
This change also posts to the queue and/or topic when
the stream is destroyed.
@rskew rskew changed the title DO NOT MERGE: All non upstreamed changes DO NOT MERGE: All non-upstreamed changes Jan 21, 2025
@rskew rskew force-pushed the all-non-upstreamed-changes branch 2 times, most recently from 79ed826 to 320a9f1 Compare January 21, 2025 08:03
Example graph:
   __________
  /   \      \
 A     B ---- C --->
  \___/______/
has syntax in a pipeline definition:
  "graph": [
    "(A B (A.a_out_1: b_in_1 A.a_out_2: b_in_2) C (A.a_out_1: c_in_1 B.b_out_1: c_in_2 A.a_out_2: c_in_3))"
  ],
Note that output names must be fully-qualified, e.g. "B.b_out_1" instead
of "b_out_1". This is due to the graph traversal not yet handling edges
defined between B and C in the example graph, only between A and B, and
between A and C.
@rskew rskew force-pushed the all-non-upstreamed-changes branch from 320a9f1 to fdfa94c Compare January 21, 2025 08:21
@rskew
Copy link
Collaborator Author

rskew commented Feb 3, 2025

Looks like we're using master to represent geekscape/aiko_services/master with our changes on top, so we can close this

@rskew rskew closed this Feb 3, 2025
@rskew rskew deleted the all-non-upstreamed-changes branch February 18, 2025 01:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant