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.

Sign up for GitHub

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

Jump to bottom

fix-2024-migrate-error #1164

Merged
merged 3 commits into from
Feb 22, 2024
Merged

fix-2024-migrate-error #1164

merged 3 commits into from
Feb 22, 2024

Conversation

SivanYeh
Copy link
Collaborator

Types of changes

Please put an x in the box that applies

  • [ x] Bugfix
  • New feature
  • Refactoring
  • Breaking change (any change that would cause existing functionality to not work as expected)
  • Documentation Update
  • Other (please describe)

Description

Describe what the change is

While 2024-migrate on staging worked well after $docker-compose up -d --build, the main branch master did not after origin/2024-migrate was merged.

It caused 502 error after built:
image

It was caused by the difference between origin/2024-migrate and staging/2024-migrate fixed by this PR.

@codecov-commenter
Copy link

codecov-commenter commented Feb 21, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (267c525) 70.59% compared to head (5203935) 70.59%.
Report is 6 commits behind head on master.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #1164   +/-   ##
=======================================
  Coverage   70.59%   70.59%           
=======================================
  Files          85       85           
  Lines        3394     3394           
=======================================
  Hits         2396     2396           
  Misses        998      998

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@SivanYeh SivanYeh merged commit a3fa21b into master Feb 22, 2024
1 check passed
josix added a commit that referenced this pull request Apr 7, 2024
@josix
Squashed commit of the following:
3b450dc 
commit f349915
Merge: f44e7ea d680271
Author: Sivan <[email protected]>
Date:   Sun Apr 7 19:37:26 2024 +0800

    Merge pull request #1170 from pycontw/resolve-cve-babel-traverse

    deps: resolve CVE-2023-45133

commit d680271
Author: Matt Wang <[email protected]>
Date:   Sat Apr 6 01:50:00 2024 +0800

    chore: use babel7 in the compressor command

commit 1af235f
Author: Matt Wang <[email protected]>
Date:   Sat Apr 6 01:44:34 2024 +0800

    deps: upgrade babel and presets

    `babel-upgrade` is utlized to replace the presets with multiple packages.
    https://github.com/babel/babel-upgrade

commit 228ec3e
Author: Matt Wang <[email protected]>
Date:   Sat Apr 6 01:43:14 2024 +0800

    chore(docker): update for better cache utilizing when rebuild

commit f44e7ea
Merge: d956956 7726ba7
Author: Sivan <[email protected]>
Date:   Sat Feb 24 15:41:51 2024 +0800

    Merge pull request #1166 from pycontw/feat-delete-cfp-preferred-date

    remove prefer_time for cfp

commit 7726ba7
Author: svyeh <[email protected]>
Date:   Sat Feb 24 15:41:13 2024 +0800

    remove prefer_time in messages

commit dfabd13
Author: svyeh <[email protected]>
Date:   Sat Feb 24 15:13:55 2024 +0800

    remove prefer_time in tests

commit 28e454a
Author: svyeh <[email protected]>
Date:   Sat Feb 24 10:27:32 2024 +0800

    remove prefer_time

    remove prefer_time from src/core/choices.py and src/core/models.py then executed the following:
    $ python manage.py makemigrations
    $python manage.py makemessages -l en_US -l zh_Hant

commit d956956
Merge: a3fa21b 9961b6f
Author: svyeh <[email protected]>
Date:   Thu Feb 22 18:47:57 2024 +0800

    Merge branch 'adjust_conference_date_to_2024'

commit a3fa21b
Merge: 4a2c1db 5203935
Author: Sivan <[email protected]>
Date:   Thu Feb 22 18:15:36 2024 +0800

    Merge pull request #1164 from pycontw/check_master

    fix-2024-migrate-error

commit 5203935
Author: svyeh <[email protected]>
Date:   Thu Feb 22 17:30:57 2024 +0800

    switch back .python-version to 3.6.8

commit 4a2c1db
Merge: 8331a9b fddc160
Author: Sivan <[email protected]>
Date:   Thu Feb 22 17:19:51 2024 +0800

    Merge pull request #1165 from rockleona/feat/coc-update

    feat: add procedure image in CoC

commit fddc160
Author: rockleona <[email protected]>
Date:   Thu Feb 22 14:17:23 2024 +0800

    feat: add procedure image in CoC

commit 8331a9b
Merge: d9b684b 091501a
Author: Sivan <[email protected]>
Date:   Thu Feb 22 13:58:44 2024 +0800

    Merge pull request #1160 from pycontw/ben/fix-svg-no-show

    fix(Dockerfile): Add mime-support apt package at dockerfile to resolve svg not showing

commit 9961b6f
Author: svyeh <[email protected]>
Date:   Wed Feb 21 15:16:02 2024 +0800

    apply makemigrations and makemessages

    auto result after two cmd:
    $python manage.py makemigrations

    $python manage.py makemessages -l en_US -l zh_Hant

commit 091501a
Merge: 5fca928 d9b684b
Author: Josix <[email protected]>
Date:   Wed Feb 21 14:36:48 2024 +0800

    Merge branch 'master' into ben/fix-svg-no-show

commit b285d42
Author: svyeh <[email protected]>
Date:   Wed Feb 21 13:54:43 2024 +0800

    adjust allowed_host

commit d09ca24
Author: svyeh <[email protected]>
Date:   Wed Feb 21 12:29:28 2024 +0800

    fix typo

commit a280a4f
Author: svyeh <[email protected]>
Date:   Wed Feb 21 00:14:09 2024 +0800

    Update django.po

commit 6b90e35
Author: svyeh <[email protected]>
Date:   Tue Feb 20 22:17:21 2024 +0800

    adjustment_from_staging_2024-migrate

commit 5fca928
Merge: 8da7a3a d6e616b
Author: Sivan <[email protected]>
Date:   Sun Feb 18 09:16:14 2024 +0800

    Merge pull request #1155 from pycontw/2024-migrate

    feat: update PyConTW 2023 to 2024(BackEnd)

commit d9b684b
Merge: d3d5005 267c525
Author: Sivan <[email protected]>
Date:   Mon Feb 19 21:12:33 2024 +0800

    Merge pull request #1161 from rockleona/feat/coc-update

    feat: update code-of-conduct 2024 version

commit 267c525
Author: RockLeon <[email protected]>
Date:   Mon Feb 19 21:08:57 2024 +0800

    Apply suggestions from code review

    Co-authored-by: Sivan <[email protected]>

commit 5b265fa
Author: Sivan <[email protected]>
Date:   Mon Feb 19 20:27:55 2024 +0800

    update en-coc effective date

    2023->2024/02/20

commit a1766ad
Author: Sivan <[email protected]>
Date:   Mon Feb 19 20:07:18 2024 +0800

    Update code-of-conduct.html

    Differences compare to the provided doc

commit b674918
Author: svyeh <[email protected]>
Date:   Mon Feb 19 13:23:45 2024 +0800

    adjust_conference_date_to_2024

    update date in 2023 to 2024

commit b920937
Author: rockleona <[email protected]>
Date:   Sun Feb 18 21:31:40 2024 +0800

    feat: update code-of-conduct 2024 version

commit d3d5005
Merge: 8da7a3a d6e616b
Author: Sivan <[email protected]>
Date:   Sun Feb 18 09:16:14 2024 +0800

    Merge pull request #1155 from pycontw/2024-migrate

    feat: update PyConTW 2023 to 2024(BackEnd)

commit d6e616b
Merge: 3deb4db 8da7a3a
Author: Sivan <[email protected]>
Date:   Sat Feb 17 23:53:49 2024 +0800

    Merge branch 'master' into 2024-migrate

commit 8da7a3a
Merge: c520012 913fef7
Author: Josix <[email protected]>
Date:   Sun Jan 28 09:38:16 2024 +0800

    Merge pull request #1157 from pycontw/fix_node_not_found

commit 913fef7
Author: iknowright <[email protected]>
Date:   Sat Jan 27 18:28:03 2024 +0800

    fix: dockerfile

    fix node_modules path for production dockerfile

commit 3deb4db
Author: Matt Wang <[email protected]>
Date:   Sat Jan 27 14:33:47 2024 +0800

    fix(docker): update uwsgi mount path

commit 731cb60
Author: Matt Wang <[email protected]>
Date:   Sat Jan 27 12:40:38 2024 +0800

    fix(assest): fix logo path

commit 26d97c3
Author: Wei-Hsiang (Matt) Wang <[email protected]>
Date:   Sat Jan 27 03:08:37 2024 +0000

    fix(migration): add migration scripts

commit 9189009
Author: Sivan <[email protected]>
Date:   Mon Jan 22 22:28:22 2024 +0800

    Update src/templates/pycontw-2024/contents/_base.html

    Co-authored-by: Wei-Hsiang (Matt) Wang <[email protected]>

commit 0fa8f3b
Author: Sivan <[email protected]>
Date:   Mon Jan 22 21:50:46 2024 +0800

    Update base.html from 2023 to 2024

    Co-authored-by: Wei-Hsiang (Matt) Wang <[email protected]>

commit 9a0e16f
Author: svyeh <[email protected]>
Date:   Mon Jan 22 17:30:44 2024 +0800

    feat: update PyConTW 2023 to 2024(BackEnd)

    feat: update PyConTW 2023 to 2024(BackEnd)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattwang44 mattwang44 mattwang44 approved these changes

@iknowright iknowright Awaiting requested review from iknowright

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@SivanYeh @codecov-commenter @mattwang44