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

Move Makefile and docker-compose.yml to repo root #1531

Conversation

myieye
Copy link
Collaborator

@myieye myieye commented Oct 18, 2022

Fixes #1511

Description

Makefiles as well as docker-compose.yml are expected to be in the project root, so this PR moves them both there.

Type of Change

  • Repo restructure

Checklist

  • I have performed a self-review of my own code
  • I have reviewed the title/description of this PR which will be used as the squashed PR commit message

@github-actions
Copy link

github-actions bot commented Oct 18, 2022

Unit Test Results

368 tests   368 ✔️  13s ⏱️
    1 suites      0 💤
    1 files        0

Results for commit 4848e99.

♻️ This comment has been updated with latest results.

@myieye myieye force-pushed the chore/1511-chore-move-makefile-to-repo-root-out-of-docker-directory branch 7 times, most recently from c288c21 to 2b6494a Compare October 18, 2022 13:04
Copy link
Collaborator

@megahirt megahirt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wow, this is great work with surgical precision! LGTM

I assume that you have run all of the Makefile targets locally and it behaves as expected, since CI does not exercise all targets.

@myieye myieye force-pushed the chore/1511-chore-move-makefile-to-repo-root-out-of-docker-directory branch from 2b6494a to 4848e99 Compare October 18, 2022 13:35
@myieye
Copy link
Collaborator Author

myieye commented Oct 18, 2022

wow, this is great work with surgical precision! LGTM

I assume that you have run all of the Makefile targets locally and it behaves as expected, since CI does not exercise all targets.

Yeah, I ran all the make targets in the main makefile. e2e-tests fails, but I'm pretty sure that's unrelated/expected.

Bellows E2E Change Password app
    ✓ setup: login as user, go to change password page
    ✓ refuses to allow form submission if the confirm input does not match
    ✓ allows form submission if the confirm input matches
    ✓ can successfully changes user's password after form submission

  Bellows E2E Project Settings app
    ✗ Normal user cannot access projectSettings to a project of which the user is a member
      - Failed: Project Test Project not found.
          at wrappedReject (/data/node_modules/jasminewd2/index.js:100:24)
          at runMicrotasks (<anonymous>)
          at processTicksAndRejections (node:internal/process/task_queues:96:5)
      From: Task: Run it("Normal user cannot access projectSettings to a project of which the user is a member") in control flow
          at UserContext.<anonymous> (/data/node_modules/jasminewd2/index.js:94:19)
      From asynchronous test: 
      Error
          at Suite.<anonymous> (/data/test/app/bellows/project-settings.e2e-spec.ts:14:3)
          at apply (/data/node_modules/lodash/lodash.js:490:27)
          at Env.wrapper [as describe] (/data/node_modules/lodash/lodash.js:5379:16)
          at Object.<anonymous> (/data/test/app/bellows/project-settings.e2e-spec.ts:8:1)
          at Module._compile (node:internal/modules/cjs/loader:1103:14)

@myieye myieye marked this pull request as ready for review October 18, 2022 13:37
@myieye myieye enabled auto-merge (squash) October 18, 2022 13:42
@myieye myieye merged commit 999f83f into develop Oct 18, 2022
@myieye myieye deleted the chore/1511-chore-move-makefile-to-repo-root-out-of-docker-directory branch October 18, 2022 13:46
Copy link
Contributor

@longrunningprocess longrunningprocess left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

excellent work so far, I think there are a handful of improvements we can still make

package.json Show resolved Hide resolved
.vscode/tasks.json Show resolved Hide resolved
docker-compose.yml Show resolved Hide resolved
docker-compose.yml Show resolved Hide resolved
docs/DEVELOPER.md Show resolved Hide resolved
playwright.config.ts Show resolved Hide resolved
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.

chore: move Makefile to repo root, out of docker directory
3 participants