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

chore: Redirect case.html #2048

Merged
merged 106 commits into from
Mar 8, 2023
Merged

chore: Redirect case.html #2048

merged 106 commits into from
Mar 8, 2023

Conversation

max-sixty
Copy link
Member

This will fix the tests in #2040

max-sixty and others added 30 commits February 19, 2023 02:37
Revert "feat!: loop (PRQL#1642)"

This reverts commit c79c5f1.
(Possibly fixing would have been easier, sorry if this is creating more work. I do think running all tests is worthwhile with this sort of wide-ranging change...)
* tests: Refactor book snapshot tests

Modularizes these tests, potentially in preparation for PRQL#1895
Revert "test: Refactor book snapshot tests (PRQL#1900)"

This reverts commit abc61ff.
* build: Disable prql-elixir on Mac

A temporary pause on building `prql-elixir` on Mac, as it's causing some build caching issues, as described in the Readme

There are lots of ways to re-enable when we're ready.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* test: Refactor book snapshot tests

Re-reverting PRQL#1900
* refactor: Options as &Options

Not sure if this is worthwhile — I started in one function and then kept on replacing. Fine to close if not an improvement.

* .
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.246 → v0.0.248](astral-sh/ruff-pre-commit@v0.0.246...v0.0.248)
- [github.com/pre-commit/mirrors-mypy: v1.0.0 → v1.0.1](pre-commit/mirrors-mypy@v1.0.0...v1.0.1)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* docs: Add a doc on `prql-elixir` on Mac
* ci: Run non-core tests through `test-all.yaml`

As pointed out in https://github.com/PRQL/prql/pull/1860/files#r1112279486, we're currently running these tests twice — once because they're in the `test-all.yaml` workflow, which is called on `main` commits, and once because they're called on `main` themselves.

This disables them being called by `main` commits.

It's possible the existing mode is required to generate caches; let's try disabling and assess, though.
* Update README.md

* Create php.md

* Create .gitignore

* Add files via upload

* Update composer.json

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update composer.json

* Update Compiler.php

* Update prql-php/.gitignore

Co-authored-by: Maximilian Roos <[email protected]>

* Add composer lock file

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Create test-php.yaml

* Update test-php.yaml

* Update test-php.yaml

* Update composer.json

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update composer.json

* Update test-php.yaml

* Update test-php.yaml

* Update test-php.yaml

* Update test-php.yaml

* Update test-php.yaml

* Uncomment unit tests

* Pass test dir as args

* Bootstrap the autoloader

* Build library and copy library file

* Update test-php.yaml

* Update test-php.yaml

* Update test-php.yaml

* Update test-php.yaml

* Update test-php.yaml

* Update test-php.yaml

* Update test-php.yaml

* Add more unit tests

* Update CompilerTest.php

* Update test-php.yaml

* Update CompilerTest.php

* Update test-php.yaml

* Add test-php

* Add concurrency thing

Co-authored-by: Maximilian Roos <[email protected]>

* Remove php-actions/phpunit

* Update .github/workflows/test-php.yaml

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Maximilian Roos <[email protected]>
Co-authored-by: Maximilian Roos <[email protected]>
* Create create-deb.yaml

* Update create-deb.yaml

* Update create-deb.yaml

* Update create-deb.yaml

* Add build-deb-package job

* Delete create-deb.yaml

* Update .github/workflows/release.yaml

* Update .github/workflows/release.yaml

* Update .github/workflows/release.yaml

---------

Co-authored-by: Maximilian Roos <[email protected]>
Co-authored-by: Maximilian Roos <[email protected]>
Otherwise cargo lists the name of every test; very verbose IMO.
* Create snapcraft.yaml

* Update snapcraft.yaml

* Create publish-snap.yaml

* Update publish-snap.yaml

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update prql-compiler/snap/snapcraft.yaml

Co-authored-by: Maximilian Roos <[email protected]>

* Update publish-snap.yaml

* Update snapcraft.yaml

* Update and rename prql-compiler/snap/snapcraft.yaml to snap/snapcraft.yaml

* Update publish-snap.yaml

* Update snap/snapcraft.yaml

Co-authored-by: Maximilian Roos <[email protected]>

* Add step to build and publish Snap

* Delete publish-snap.yaml

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Maximilian Roos <[email protected]>
As requested by @vanillajonathan.

@vanillajonathan one thing we could add for all these is to upload them as artifacts, as an easy way to have them published, using something like PRQL#1883 (comment).

It's less permanent than publishing them as release assets, but we can do the artifact upload now without changing our release process.
* Add Snap package

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Create create-rpm.yaml

* Update create-rpm.yaml

* Add job for building .rpm package

* Delete create-rpm.yaml

* Update .github/workflows/release.yaml

Co-authored-by: Maximilian Roos <[email protected]>

* Update .github/workflows/release.yaml

Co-authored-by: Maximilian Roos <[email protected]>

* Update release.yaml

* Update .github/workflows/release.yaml

Co-authored-by: Maximilian Roos <[email protected]>

* Update .github/workflows/release.yaml

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: Maximilian Roos <[email protected]>
Co-authored-by: Maximilian Roos <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* fix: Return a non-zero exit code for `prqlc compile` errors

* .
* ci: Add `internal` & `devops` to semantic commit options
eitsupi and others added 17 commits March 5, 2023 20:52
* docs: Add error messages to the book

This allows us to show and test error messages in the book, and adds an initial example.

Unfortunately the initial example doesn't have a great error message! So that's something we could work on.

It also updates the docs to add late binding — now functions support that!

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* .

* .

* .

* .

* .

* test: Test formatted examples can compile

We remove the snapshot output of them all -- even having written these, I was getting confused what all the snapshots were. And we don't use them at all. I added a TODO in the code for a good design if we could make progress on the autoformatter.

* Revert ""

This reverts commit 1937692.

* clean up merge diff

* .

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* build: add definitions for devcontainer base image

* build: split install-cargo-tools task to another Taskfile
* build: always build amd64 and arm64

* build: fix copying Taskfile

* chore: bump base image version and pin to bullseye

* build: try only build arm64

* build: build amd64 only for now
updates:
- [github.com/crate-ci/typos: v1.13.12 → v1.13.18](crate-ci/typos@v1.13.12...v1.13.18)
- [github.com/pre-commit/mirrors-prettier: v3.0.0-alpha.4 → v3.0.0-alpha.6](pre-commit/mirrors-prettier@v3.0.0-alpha.4...v3.0.0-alpha.6)
- [github.com/charliermarsh/ruff-pre-commit: v0.0.252 → v0.0.254](astral-sh/ruff-pre-commit@v0.0.252...v0.0.254)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* devops: Add shortcuts for insta in `bacon`

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* devops: Sync bacon command with `test-rust`

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* feat: Rename `switch` to `case`

In case `switch` is confusing, this switches `switch` for `case`. Hopefully the switch won't lead to a case of confusion; or we can case the decision again.
…QL#1893)

* chore: add devcontainer config file

* build: add base devcontainer definition and build workflow file

* First cut, very low-quality draft for Dev Containers

I have written about 98% of what I know. Let's all contribute to strengthen this document. Thanks.

* Remove "will" in favor of direct action words.

It's almost always better to write documentation saying "thing X _does_ action Y" instead of "thing X will do action Y".

* Update using-dev-container.md

* Update using-dev-container.md

* Final editorial tweak for first-cut description

* Update to reflect @eitsupi's comments

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* docs: some updates about VS Code Dev Containers

* docs: update title and add note

* docs: add a link to containers.dev

* docs: formatting lists

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* build: use only Dockerfile for base pre-built image

* ci: update workflow to use docker/build-push-action

* chore: autoformatting

* build: fix workflow trigger

* chore: fix path

* fix: fix GHA syntax

* fix: fix typo

* ci: use docker/metadata-action to prepare tags

* build: use pre-built image as devcontainer base image

* build: remove task for devcontainer setup for now

* chore: sync vscode extensions in devcontainer.json

* docs: some document update and install zsh completion

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* docs: add the page about devcontainers to the book

* build: set postCreateCommand

* chore: fix version of go-task Dev Container Feature

* docs: remove superfluous comment

---------

Co-authored-by: Maximilian Roos <[email protected]>
Co-authored-by: Rich Brown <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
These are good docs, but there's no reason for them to be here. They'd be good in the Taskfile, or very open to other suggestions

While I _really_ appreciate docs that we write (CC @richbhanover), it's important that they're focused, concise, and close to the code that they document -- because they also need to be maintained, and the project takes on that responsibility.

I really don't want to lose folks' generosity and ideas, but I'm going to start being a bit firmer on these sorts of things, because we're already starting to see some stale docs (PRQL#2044). There are other ways of writing things that have fewer guarantees of continued support -- blog posts, gists, etc.
This will fix the tests in PRQL#2040
@max-sixty max-sixty enabled auto-merge (squash) March 8, 2023 00:36
@max-sixty max-sixty changed the base branch from main to web March 8, 2023 00:44
@max-sixty max-sixty merged commit 241d893 into PRQL:web Mar 8, 2023
@max-sixty max-sixty deleted the book-redirect branch March 8, 2023 00:44
@prql-bot
Copy link
Collaborator

prql-bot commented Mar 8, 2023

The backport to web failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-web web
# Navigate to the new working tree
cd .worktrees/backport-web
# Create a new branch
git switch --create backport-2048-to-web
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 241d8933f5c50662055504fb4d2621f396d32200
# Push it to GitHub
git push --set-upstream origin backport-2048-to-web
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-web

Then, create a pull request where the base branch is web and the compare/head branch is backport-2048-to-web.

@max-sixty
Copy link
Member Author

Sorry, this was a terrible git mistake. I'm reverting the web branch and fixing.

max-sixty added a commit that referenced this pull request Mar 8, 2023
max-sixty added a commit that referenced this pull request Mar 8, 2023
@max-sixty
Copy link
Member Author

OK I applied only the correct diff to web and pushed manually. It's correct that the redirect won't be on main, and so will get blasted away when we force push main when we release

@aljazerzen
Copy link
Member

I git pinged from the commit message. Is using the backport bot really easier than a push to web branch?

@max-sixty
Copy link
Member Author

I think you get pinged because it has every commit in it, because I messed up the merge.

Is using the backport bot really easier than a push to web branch?

Yes — much!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants