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

Set num_loc correctly when publishing a solution #2260

Merged
merged 2 commits into from
Jan 27, 2022

Conversation

ErikSchierboom
Copy link
Member

@ErikSchierboom ErikSchierboom commented Dec 10, 2021

This fixes the issue of an incorrect num_loc if a solution had multiple iterations and was then published using a specific iteration.

@iHiD
Copy link
Member

iHiD commented Dec 10, 2021

So one question with this is what happens when someone has set to publish all iterations, and then publish a new iteration. Will this get updated?

@ErikSchierboom
Copy link
Member Author

I think that's when https://github.com/exercism/website/blob/main/app/commands/solution/publish_iteration.rb is called (which already had the right code). I'll double check.

@ErikSchierboom
Copy link
Member Author

Ah no, the path is different. The num_loc gets updated in https://github.com/exercism/website/blob/main/app/jobs/calculate_lines_of_code_job.rb#L31

@iHiD
Copy link
Member

iHiD commented Dec 10, 2021

Should we DRY this up with

?

@ErikSchierboom
Copy link
Member Author

I considered doing that. The only difference is that Publish also sets the published_at date. Thoughts on how to elegantly handle that?

@iHiD
Copy link
Member

iHiD commented Jan 14, 2022

@ErikSchierboom I've DRY'd it up. Can you check you're happy pls.

Copy link
Member Author

@ErikSchierboom ErikSchierboom left a comment

Choose a reason for hiding this comment

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

Yes, nice!

@iHiD iHiD merged commit a39844d into main Jan 27, 2022
@iHiD iHiD deleted the set-num-loc-when-publishing branch January 27, 2022 12:19
ErikSchierboom pushed a commit that referenced this pull request Feb 1, 2022
Run rails app:update

Start process of porting CSS to Tailwind 3

Use propshaft instead of sprockets

WIP Use esbuild not webpack

Fix trailing whitespace lint error

Update Dockerfile to Rails 3.0.3

Fix init.sql for mysql 8

Fix connecting to database

Normalize quotes

Enable yarn build in background

Disable js watch

Work

Missing files

Get icons working

Allow importing manifest

Use asset url helper

Remove dynamic require

Remove webpack-specific files

Temporarily use local exercism config

Temporarily use local exercism config

Copy config items

Update manifest

Win

Refactor code

Remove unused define

Update

Change vendor prefix

Update

Enable watch mode for js

Minify JS in production

Minify CSS in production

Remove unused code

Remove webpack bin scripts

Move listen gem out of development group

Update manifest in background

Ignore javascript config files

Upgrade config to  0.81.0

Use .config dir

Apply review comments

Upgrade to Ruby 3.1.0

Update bundler version

Fixes rubygems/rubygems#5234

Rename monitor_manifest to monitor-manifest

Upgrade to Rails 7.0.1

Remove webpack references

Exclude file

Fix anycable

Fix anycable

Fix css name

Remove webpacker helper references

Fix passing of params to I18N

Fix asset paths

Fix i18n call

Fix more tests

Add .keep file for .config dir

Add .keep file

Fix esbuild

Some tweaks (#2329)

Co-authored-by: Erik Schierboom <erik_schierboom@hotmail.com>

Fix timestamp test

Fix old image_pack_url

Fix path

Use git version for mysql gem

Remove image

Update Setup Ruby workflow

Add missing package

Don't run tests serially

Fix manifest import

Don't use esbuild-jest

Remove svg plugin

Upate lockfile

Add TODO

Fix rails tests

Build for browserslist

Fix failing tests

Fix failing tests

Fix duplicate key exception in seeds.rb

See https://blog.saeloun.com/2021/03/08/rails-6-1-adds-excluding-to-active-record-relation.html for the .excluding method

Fix websockets

Fix icon call

Fix icons in notifications (#2333)

* Fix icons in notifications

* Fix more stuff

Fix image url for blog post

Sync blog and main docs in seeding

Update octokit

This fixes a warning: octokit/octokit.rb#1359

Fix deprecation warning

Build test.js file

Fix uri encode test

Remove unused import

Use test:prepare instead of assets:precompile

Add empty string to tag.div

Fix omniauth

Write manifest JSON files in test helper

Fix modal argument

Enable esbuild splitting (#2342)

* Enable esbuild splitting

* Add comment

Update migrations to 7.0

Fix CSS classes not inheriting correctly

Add precision to datetime columns

Fix invalid error icon

Remove unused import

Fix non-unique key

Fix JS bug

Moves highlighters CSS to postcss

Remove socket configuration (#2341)

* Member badge shouldn't use estimate for percentage awardees (#2330)

* Remove socket configuration

Co-authored-by: Jeremy Walker <jez.walker@gmail.com>

Member badge shouldn't use estimate for percentage awardees (#2330)

Don't consider wip prerequisites (#2344)

* Don't consider wip prerequisites

* Rename to learnable_concept_slugs

Add timeouts to CI builds (#2331)

* Add timeouts to CI builds

Right now the builds are all stuck for some reason, clogging up the queues. They normal appear to be taking ~2-3 minutes, so a timeout of 30 minutes should be more than enough to prevent this issue in the future.

* Add system tests & rubocup

[skip ci]

Set num_loc correctly when publishing a solution (#2260)

* Set num_loc correctly when publishing a solution

* DRY up publishing and publishing iteration

Co-authored-by: Jeremy Walker <jez.walker@gmail.com>

Fix typo in bug report modal (#2339)

Add first draft of fundraising job role (#2337)

* Add first draft of fundraising job role

* Spelling

* Improve

* Tweaks from DJ

* More tweaks

* Add more

* Tweaks

* Tweaks

* Final tweak

Update setup-ruby action

DRY up code around tooling files (#2257)

* DRY up logic slightly

* Add tests to verify editor files

* Use proper directory

* Fix representation file paths

* DRY further (#2348)

Co-authored-by: Jeremy Walker <jez.walker@gmail.com>

Allow sorting user solutions by most starred (#2238)

* Allow sorting user solutions by num stars

* Allow sorting user published solutions by most stars

* Update system test

* Fix sorting in test

* Improve default of sorting

* Fix many tests

rails 7 rubocop (#2349)

* Update rubocop gems

* Format using rubocop

* Add num_stars

* Fix rubocop warning
ErikSchierboom pushed a commit that referenced this pull request Feb 1, 2022
Run rails app:update

Start process of porting CSS to Tailwind 3

Use propshaft instead of sprockets

WIP Use esbuild not webpack

Fix trailing whitespace lint error

Update Dockerfile to Rails 3.0.3

Fix init.sql for mysql 8

Fix connecting to database

Normalize quotes

Enable yarn build in background

Disable js watch

Work

Missing files

Get icons working

Allow importing manifest

Use asset url helper

Remove dynamic require

Remove webpack-specific files

Temporarily use local exercism config

Temporarily use local exercism config

Copy config items

Update manifest

Win

Refactor code

Remove unused define

Update

Change vendor prefix

Update

Enable watch mode for js

Minify JS in production

Minify CSS in production

Remove unused code

Remove webpack bin scripts

Move listen gem out of development group

Update manifest in background

Ignore javascript config files

Upgrade config to  0.81.0

Use .config dir

Apply review comments

Upgrade to Ruby 3.1.0

Update bundler version

Fixes rubygems/rubygems#5234

Rename monitor_manifest to monitor-manifest

Upgrade to Rails 7.0.1

Remove webpack references

Exclude file

Fix anycable

Fix anycable

Fix css name

Remove webpacker helper references

Fix passing of params to I18N

Fix asset paths

Fix i18n call

Fix more tests

Add .keep file for .config dir

Add .keep file

Fix esbuild

Some tweaks (#2329)

Co-authored-by: Erik Schierboom <erik_schierboom@hotmail.com>

Fix timestamp test

Fix old image_pack_url

Fix path

Use git version for mysql gem

Remove image

Update Setup Ruby workflow

Add missing package

Don't run tests serially

Fix manifest import

Don't use esbuild-jest

Remove svg plugin

Upate lockfile

Add TODO

Fix rails tests

Build for browserslist

Fix failing tests

Fix failing tests

Fix duplicate key exception in seeds.rb

See https://blog.saeloun.com/2021/03/08/rails-6-1-adds-excluding-to-active-record-relation.html for the .excluding method

Fix websockets

Fix icon call

Fix icons in notifications (#2333)

* Fix icons in notifications

* Fix more stuff

Fix image url for blog post

Sync blog and main docs in seeding

Update octokit

This fixes a warning: octokit/octokit.rb#1359

Fix deprecation warning

Build test.js file

Fix uri encode test

Remove unused import

Use test:prepare instead of assets:precompile

Add empty string to tag.div

Fix omniauth

Write manifest JSON files in test helper

Fix modal argument

Enable esbuild splitting (#2342)

* Enable esbuild splitting

* Add comment

Update migrations to 7.0

Fix CSS classes not inheriting correctly

Add precision to datetime columns

Fix invalid error icon

Remove unused import

Fix non-unique key

Fix JS bug

Moves highlighters CSS to postcss

Remove socket configuration (#2341)

* Member badge shouldn't use estimate for percentage awardees (#2330)

* Remove socket configuration

Co-authored-by: Jeremy Walker <jez.walker@gmail.com>

Member badge shouldn't use estimate for percentage awardees (#2330)

Don't consider wip prerequisites (#2344)

* Don't consider wip prerequisites

* Rename to learnable_concept_slugs

Add timeouts to CI builds (#2331)

* Add timeouts to CI builds

Right now the builds are all stuck for some reason, clogging up the queues. They normal appear to be taking ~2-3 minutes, so a timeout of 30 minutes should be more than enough to prevent this issue in the future.

* Add system tests & rubocup

[skip ci]

Set num_loc correctly when publishing a solution (#2260)

* Set num_loc correctly when publishing a solution

* DRY up publishing and publishing iteration

Co-authored-by: Jeremy Walker <jez.walker@gmail.com>

Fix typo in bug report modal (#2339)

Add first draft of fundraising job role (#2337)

* Add first draft of fundraising job role

* Spelling

* Improve

* Tweaks from DJ

* More tweaks

* Add more

* Tweaks

* Tweaks

* Final tweak

Update setup-ruby action

DRY up code around tooling files (#2257)

* DRY up logic slightly

* Add tests to verify editor files

* Use proper directory

* Fix representation file paths

* DRY further (#2348)

Co-authored-by: Jeremy Walker <jez.walker@gmail.com>

Allow sorting user solutions by most starred (#2238)

* Allow sorting user solutions by num stars

* Allow sorting user published solutions by most stars

* Update system test

* Fix sorting in test

* Improve default of sorting

* Fix many tests

rails 7 rubocop (#2349)

* Update rubocop gems

* Format using rubocop

* Add num_stars

* Fix rubocop warning
iHiD added a commit that referenced this pull request Feb 3, 2022
* Bump Gem to Rails 7, and switch to Ruby 3.0.3

Run rails app:update

Start process of porting CSS to Tailwind 3

Use propshaft instead of sprockets

WIP Use esbuild not webpack

Fix trailing whitespace lint error

Update Dockerfile to Rails 3.0.3

Fix init.sql for mysql 8

Fix connecting to database

Normalize quotes

Enable yarn build in background

Disable js watch

Work

Missing files

Get icons working

Allow importing manifest

Use asset url helper

Remove dynamic require

Remove webpack-specific files

Temporarily use local exercism config

Temporarily use local exercism config

Copy config items

Update manifest

Win

Refactor code

Remove unused define

Update

Change vendor prefix

Update

Enable watch mode for js

Minify JS in production

Minify CSS in production

Remove unused code

Remove webpack bin scripts

Move listen gem out of development group

Update manifest in background

Ignore javascript config files

Upgrade config to  0.81.0

Use .config dir

Apply review comments

Upgrade to Ruby 3.1.0

Update bundler version

Fixes rubygems/rubygems#5234

Rename monitor_manifest to monitor-manifest

Upgrade to Rails 7.0.1

Remove webpack references

Exclude file

Fix anycable

Fix anycable

Fix css name

Remove webpacker helper references

Fix passing of params to I18N

Fix asset paths

Fix i18n call

Fix more tests

Add .keep file for .config dir

Add .keep file

Fix esbuild

Some tweaks (#2329)

Co-authored-by: Erik Schierboom <erik_schierboom@hotmail.com>

Fix timestamp test

Fix old image_pack_url

Fix path

Use git version for mysql gem

Remove image

Update Setup Ruby workflow

Add missing package

Don't run tests serially

Fix manifest import

Don't use esbuild-jest

Remove svg plugin

Upate lockfile

Add TODO

Fix rails tests

Build for browserslist

Fix failing tests

Fix failing tests

Fix duplicate key exception in seeds.rb

See https://blog.saeloun.com/2021/03/08/rails-6-1-adds-excluding-to-active-record-relation.html for the .excluding method

Fix websockets

Fix icon call

Fix icons in notifications (#2333)

* Fix icons in notifications

* Fix more stuff

Fix image url for blog post

Sync blog and main docs in seeding

Update octokit

This fixes a warning: octokit/octokit.rb#1359

Fix deprecation warning

Build test.js file

Fix uri encode test

Remove unused import

Use test:prepare instead of assets:precompile

Add empty string to tag.div

Fix omniauth

Write manifest JSON files in test helper

Fix modal argument

Enable esbuild splitting (#2342)

* Enable esbuild splitting

* Add comment

Update migrations to 7.0

Fix CSS classes not inheriting correctly

Add precision to datetime columns

Fix invalid error icon

Remove unused import

Fix non-unique key

Fix JS bug

Moves highlighters CSS to postcss

Remove socket configuration (#2341)

* Member badge shouldn't use estimate for percentage awardees (#2330)

* Remove socket configuration

Co-authored-by: Jeremy Walker <jez.walker@gmail.com>

Member badge shouldn't use estimate for percentage awardees (#2330)

Don't consider wip prerequisites (#2344)

* Don't consider wip prerequisites

* Rename to learnable_concept_slugs

Add timeouts to CI builds (#2331)

* Add timeouts to CI builds

Right now the builds are all stuck for some reason, clogging up the queues. They normal appear to be taking ~2-3 minutes, so a timeout of 30 minutes should be more than enough to prevent this issue in the future.

* Add system tests & rubocup

[skip ci]

Set num_loc correctly when publishing a solution (#2260)

* Set num_loc correctly when publishing a solution

* DRY up publishing and publishing iteration

Co-authored-by: Jeremy Walker <jez.walker@gmail.com>

Fix typo in bug report modal (#2339)

Add first draft of fundraising job role (#2337)

* Add first draft of fundraising job role

* Spelling

* Improve

* Tweaks from DJ

* More tweaks

* Add more

* Tweaks

* Tweaks

* Final tweak

Update setup-ruby action

DRY up code around tooling files (#2257)

* DRY up logic slightly

* Add tests to verify editor files

* Use proper directory

* Fix representation file paths

* DRY further (#2348)

Co-authored-by: Jeremy Walker <jez.walker@gmail.com>

Allow sorting user solutions by most starred (#2238)

* Allow sorting user solutions by num stars

* Allow sorting user published solutions by most stars

* Update system test

* Fix sorting in test

* Improve default of sorting

* Fix many tests

rails 7 rubocop (#2349)

* Update rubocop gems

* Format using rubocop

* Add num_stars

* Fix rubocop warning

* Remove active storage migrations

* Rename .manifest.json.d.ts to manifest.json.d.ts

* Make monitor manifest a 1-time opp in CI

* Fix bug in test helper

* Call super

* Fix tests

* Seperate generate js config into its own file

* Fix production nodejs build

* Fix production rails dockerfile

* Fix production rails dockerfile

* Fix assets sync

* Fix production docker build

* Workaround for NODE_ENV=production yarn install not installing devDependencies

* Use RAILS_ENV=production

* Fix failing test

* Only deploy website to website-staging

Co-authored-by: Erik Schierboom <erik_schierboom@hotmail.com>
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.

2 participants