Skip to content

merge-queue: embarking main (791db90) and #293 together#313

Closed
mergify[bot] wants to merge 8 commits intomainfrom
mergify/merge-queue/main/293
Closed

merge-queue: embarking main (791db90) and #293 together#313
mergify[bot] wants to merge 8 commits intomainfrom
mergify/merge-queue/main/293

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Mar 13, 2022

🎉 This combination of pull requests has been checked successfully 🎉

Branch main (791db90) and #293 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #293.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue default for merge:

  • base=main
  • check-success="buildkite/primer/pr/required"

More informations about Mergify merge queue can be found in the documentation.

Mergify commands

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the queue rules

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

brprice and others added 8 commits March 10, 2022 17:15
This is in preparation for having a Prog include imported modules.

BREAKING CHANGE: this change requires a database migration, as it
changes the representation of `Prog`. However, since this is just
serialised to json and stored as a blob in the DB, it requires no schema
changes. Since we have no programs we need to preserve, we decided not
to bother with a migration. This means that DBs created before this
commit will not load with a primer containing this commit.
We will shortly want to import Primer.Core(defID), and want to avoid CI
failures due to -Werror -Wname-shadowing.
We enable Primer programs to import modules. This is achieved by adding
a `progImports :: [Module]` field to `Prog`. The imported modules are
each immutable (via the api). This immutability is ensured by having all
the actions only operate on the one "current" module (that comprises the
old `progDefs` and `progTypes`). (For now, the set itself is also
immutable via the api.)

For now we don't have any namespacing, we just lookup references in all
modules and assume unique names. We leave adding hierarchical names for
future work. We also leave having multiple editable modules for future
work.

BREAKING CHANGE: this change requires a database migration, as it
changes the representation of `Prog`. However, since this is just
serialised to json and stored as a blob in the DB, it requires no schema
changes. Since we have no programs we need to preserve, we decided not
to bother with a migration. This means that DBs created before this
commit will not load with a primer containing this commit.
This is basically an action, except we don't expose it in the API. We
will delay doing so until we have a nice way for a frontend to refer to
a module. I.e. we would like to say
"import the User1.ProjectFoo.ModuleBar" module, rather than having to
explicitly give the code contained within the module.

This utility does not check that imported modules have disjointly-named
contents. We intend to shortly require a hierarchical naming scheme
which will address this concern. At that point we will also address the
issue of disjoint IDs of contents, and our freshness guarantees.

The reason we delay worrying about disjointness/uniqueness is that both
it and being able to expose this nicely in the API require the notion of
a module having some short name, rather than having to explicitly pass
around all the code contained in the module.
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Mar 13, 2022

The pull request #293 is mergeable

@mergify mergify Bot closed this Mar 13, 2022
@mergify mergify Bot deleted the mergify/merge-queue/main/293 branch March 13, 2022 13:43
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