Skip to content

Commit

Permalink
Merge branch 'hackforla:gh-pages' into test-pr-template
Browse files Browse the repository at this point in the history
  • Loading branch information
roslynwythe authored Nov 30, 2023
2 parents dfa0776 + 9249d81 commit 8165a6b
Show file tree
Hide file tree
Showing 21 changed files with 1,438 additions and 1,249 deletions.
25 changes: 18 additions & 7 deletions .github/ISSUE_TEMPLATE/project-profile-card-review-and-update.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: "Project Profile Card review and update"
description: "To track project profile card updates"
description: "To track project profile card updates or add a new project profile card"
title: "Update Project Profile: [Project Name]"
labels: ['P-Feature: Project Info and Page', 'role: back end/devOps', 'role: front end', 'Complexity: Small', 'size: 0.5pt', 'time sensitive']

Expand All @@ -15,6 +15,7 @@ body:
attributes:
label: Project Name
options:
- "---New Project---"
- "100 Automations"
- "311 Data"
- "Access The Data"
Expand Down Expand Up @@ -58,6 +59,7 @@ body:
label: Project Card URL
description: "https://github.com/hackforla/website/tree/gh-pages/_projects"
options:
- "---New Project---"
- "100-automations.md"
- "311-data.md"
- "access-the-data.md"
Expand Down Expand Up @@ -132,6 +134,19 @@ body:
attributes:
label: Description

- type: dropdown
id: update-hero-image-yes-no
attributes:
label: Update the Hero Image?
options:
- "YES"
- "NO"
validations:
required: true
- type: textarea
id: hero-image
attributes:
label: Hero Image

- type: dropdown
id: update-image-yes-no
Expand All @@ -142,13 +157,11 @@ body:
- "NO"
validations:
required: true
- type: input
- type: textarea
id: image
attributes:
label: Image



- type: dropdown
id: update-technologies-yes-no
attributes:
Expand All @@ -161,8 +174,7 @@ body:
- type: textarea
id: technologies
attributes:
label: Technologies (maximum 26 characters)

label: Technologies (maximum 26 characters per technology name)

- type: dropdown
id: update-partners-yes-no
Expand All @@ -178,7 +190,6 @@ body:
attributes:
label: Partners


- type: dropdown
id: update-tools-yes-no
attributes:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/issue-trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v4
# Check if the issue has required labels
- name: Check Labels
uses: actions/github-script@v6
uses: actions/github-script@v7
id: check-labels
with:
script: |
Expand All @@ -46,7 +46,7 @@ jobs:
- if: ${{ steps.checkUserMember.outputs.isTeamMember == 'true' }}
# Post comment based on the previous action's results
name: Post Comment
uses: actions/github-script@v6
uses: actions/github-script@v7
id: post-comment
with:
script: |
Expand All @@ -64,7 +64,7 @@ jobs:

# Check if the issue has the required roles
- name: Check Labels Prelim
uses: actions/github-script@v6
uses: actions/github-script@v7
id: check-labels-prelim
with:
script: |
Expand All @@ -76,7 +76,7 @@ jobs:
# Post the comment based on the result of the previous step
- name: Post assigning issue comment
id: assigned-comment
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const results = ${{ steps.check-labels-prelim.outputs.result }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/move-closed-issues.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Sort Closed Issues by Label
uses: actions/github-script@v6
uses: actions/github-script@v7
id: sort-closed-issues
with:
script: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-instructions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

# Create the message to post
- name: Create Instruction
uses: actions/github-script@v6
uses: actions/github-script@v7
id: instruction
with:
script: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule-fri-0700.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/github-script@v6
- uses: actions/github-script@v7
env:
IN_PROGRESS_COLUMN_ID: ${{ secrets.IN_PROGRESS_COLUMN_ID }}
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/schedule-monthly-PREV.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

# gets a list of website-write team members with no open issues, returns a list of member's github handles
- name: Get List
uses: actions/github-script@v6
uses: actions/github-script@v7
id: get-list
with:
github-token: ${{ secrets.HACKFORLA_BOT_PA_TOKEN }}
Expand All @@ -23,7 +23,7 @@ jobs:
# creates a new issue in hackforla/website repo with the list populated above. creates a project card linking to this issue
- name: Create New Issue
uses: actions/github-script@v6
uses: actions/github-script@v7
id: create-new-issue
with:
github-token: ${{ secrets.HACKFORLA_BOT_PA_TOKEN }}
Expand All @@ -35,7 +35,7 @@ jobs:
# comments on issue #2607, notifying leads that the above issue has been created
- name: Comment Issue
uses: actions/github-script@v6
uses: actions/github-script@v7
id: comment-issue
with:
github-token: ${{ secrets.HACKFORLA_BOT_PA_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/set-pr-labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ jobs:
- uses: actions/checkout@v4
- id: parse-pr-body
name: 'Parse the pull request body for all linked issues'
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const { listIssuesFromPRBody } = require('${{ env.SCRIPT_PATH }}');
return listIssuesFromPRBody({ context, core });
- id: compile-labels
name: 'Compile labels from linked issues'
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const { listLabelsFromIssues } = require('${{ env.SCRIPT_PATH }}');
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/wr-pr-instructions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- name: Download artifact
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
// Retrieve metadata about the artifacts of the last workflow
Expand All @@ -34,7 +34,7 @@ jobs:
fs.writeFileSync('${{github.workspace}}/artifact.zip', Buffer.from(download.data));
- run: unzip artifact.zip

- uses: actions/github-script@v6
- uses: actions/github-script@v7
id: artifact
with:
script: |
Expand All @@ -47,7 +47,7 @@ jobs:
- uses: actions/checkout@v4
# Create the message to post
- name: Post Comment
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const artifact = ${{ steps.artifact.outputs.result }};
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wr-set-pr-labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- uses: actions/checkout@v4
- id: download-artifact
name: 'Download artifact'
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const { downloadLabelsArtifact } = require('${{ env.SCRIPT_PATH }}');
Expand All @@ -37,7 +37,7 @@ jobs:
run: unzip '${{ env.ARTIFACT_NAME }}.zip'
- id: set-pr-labels
name: 'Set labels on the pull request'
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const { setLabelsOnPR } = require('${{ env.SCRIPT_PATH }}');
Expand Down
12 changes: 7 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,6 @@ Running the above command will result in the following output in your terminal

When you see the above output, it means the site is now running and now you can browse to http://localhost:4000

**NOTE:** If it takes longer than 2 minutes to build your website using `docker-compose up`, please let the [technical leads](https://github.com/hackforla/website/wiki/Meet-the-Team) know about this and add your website build time in a comment to [issue #1443](https://github.com/hackforla/website/issues/1443). Also, once you are part of the merge team, you can work on [issue #1443](https://github.com/hackforla/website/issues/1443) and fix it (if you want).

#### **1.6.b Stopping Docker**

- To stop and completely remove the jekyll server (i.e. the running Docker container):
Expand Down Expand Up @@ -549,9 +547,11 @@ You can also sync your fork directly on GitHub by clicking "Sync Fork" at the ri

#### **2.7.b Working on an issue (2): Create a new branch where you will work on your issue**

The `git checkout` command will create and change to a new branch where you will do the work on your issue. In git, the checkout command lets you navigate between different branches. Using the `-b` flag you can create a new branch and immediately switch into it.
If you have not already done so, run `git checkout gh-pages` to switch the working directory to the `gh-pages` branch and then update `gh-pages` with upstream changes as described above in Section 2.7.a.

Using the `-b` flag you can also use the `git checkout` command to create a new branch and immediately switch into it.

For example,if we creating a new issue branch off [Update ‘Give’ image credit link and information - #2093](https://github.com/hackforla/website/issues/2093):
For example, if you create a new issue branch for [Update ‘Give’ image credit link and information - #2093](https://github.com/hackforla/website/issues/2093):

```bash
git checkout -b update-give-link-2093
Expand All @@ -567,6 +567,8 @@ git checkout -b update-give-link-2093

**Note:** No law of physics will break if you don't adhere to this scheme, but laws of git will break if you add spaces.

We urge developers to be cautious using `git add`. In general it is not advisable to use `git add -all` or `git add .`. Rather, run `git status`, examine the output carefully, and then add only those files specifically related to the current issue. This will ensure that no extraneous files are included in the subsequent commit.

When you've finished working on your issue, follow the steps below to prepare your changes to push to your repository.

##### **i. What if you cannot see your changes locally within Docker?**
Expand Down Expand Up @@ -757,7 +759,7 @@ ssh-keygen -t rsa -b 4096 -C "[email protected]"
eval "$(ssh-agent -s)"
```

4. Next you need to add your ssh key to your ssh agent.
4. Next you need to add your ssh key to your ssh agent. In the command below, replace `id_ed25519` with the filename (without file extension) you provided in the previous step.

```bash
ssh-add -K ~/.ssh/id_ed25519
Expand Down
Loading

0 comments on commit 8165a6b

Please sign in to comment.