-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Restructure tutorial to separate instructions based on operating system #1796
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
Open
amakarudze
wants to merge
20
commits into
DjangoGirls:restructure-tutorial
Choose a base branch
from
amakarudze:change-structure-1792
base: restructure-tutorial
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 9 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
564152a
Switch to actions/deploy-pages
ekohl 39b7faa
Merge pull request #1791 from ekohl/remove-need-for-gh-pages-branch
amakarudze 00446f4
Split setup instructions and summary
amakarudze ab0d913
Restructure content by OS, refactor installation steps
amakarudze fdbbb86
Remove unnecessary files from Chromebook folder
amakarudze 91ee4c3
Fix Python installation and introduction sections
amakarudze db9e969
Fix django installation instructions
amakarudze efe896a
Restruture content up to Python introduction
amakarudze 8fc2734
Refactor deploy folder, delete reduntant folders
amakarudze 5368e73
Fix line breaks at 80 for chromebook/README.md
amakarudze 11488b4
Fix lines for chromebook/django_start_project/README.md
amakarudze 0c3e2d7
Fix line length for macosx/django_start_project/README.md
amakarudze 808a0fd
Fix runcode file line length
amakarudze b3f114c
Fix line length for windows and runcode
amakarudze 7bd90b9
Fix lines for code editor folder
amakarudze dcde212
Fix line length for more files
amakarudze 3dd54d8
Fix link for runcode django_start_project
amakarudze 213850f
Fix navigation issues, refactor SUMMARY.md
amakarudze cf28896
fix: relative image paths in specific os folders
jwhhh 19ba762
Merge pull request #1 from jwhhh/change-structure-1792
amakarudze File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,47 @@ | ||
| --- | ||
| name: Build and Deploy | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
|
|
||
| permissions: | ||
| contents: read | ||
| pages: write | ||
| id-token: write | ||
|
|
||
| concurrency: | ||
| group: "pages" | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| build-and-deploy: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| if: github.repository == 'djangogirls/tutorial' | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| persist-credentials: false | ||
|
|
||
| - name: Install and Build | ||
| run: | | ||
| npm install | ||
| npx honkit build | ||
|
|
||
| - name: Deploy | ||
| uses: JamesIves/github-pages-deploy-action@releases/v3 | ||
| - name: Upload artifact | ||
| uses: actions/upload-pages-artifact@v1 | ||
| with: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| BRANCH: gh-pages | ||
| FOLDER: _book | ||
| path: _book | ||
|
|
||
| deploy: | ||
| needs: build | ||
| permissions: | ||
| pages: write | ||
| id-token: write | ||
| environment: | ||
| name: github-pages | ||
| url: ${{ steps.deployment.outputs.page_url }} | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Deploy to GitHub Pages | ||
| id: deployment | ||
| uses: actions/deploy-pages@v2 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to do those changes with this PR? 🤔
Otherwise, I would do them separately, just so we can make it slightly smaller 😅