Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/hex/develop/phoenix-1.7.10
Browse files Browse the repository at this point in the history
  • Loading branch information
TraceyOnim authored Jun 6, 2024
2 parents a651492 + 970e3d0 commit 5c0486a
Show file tree
Hide file tree
Showing 180 changed files with 2,112 additions and 2,509 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/alpha-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

# Setup gcloud CLI
- run: |
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Deploy to Cloud Run
id: deploy
uses: google-github-actions/deploy-cloudrun@v0
uses: google-github-actions/deploy-cloudrun@v2
with:
service: quadquiz-alpha
region: us-east4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-elixir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Elixir
uses: actions/setup-elixir@v1
uses: erlef/setup-beam@v1
with:
elixir-version: '1.15.4'
otp-version: '26.0.2'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/preview-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

# Setup gcloud CLI
- run: |
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
- name: Deploy
id: deploy
uses: google-github-actions/deploy-cloudrun@v0
uses: google-github-actions/deploy-cloudrun@v2
with:
service: quadquiz-preview
region: us-east4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prod-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

# Setup gcloud CLI
- run: |
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
- name: Deploy to Cloud Run
id: deploy
uses: google-github-actions/deploy-cloudrun@v0
uses: google-github-actions/deploy-cloudrun@v2
with:
service: quadquiz
region: us-east4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/staging-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

# Setup gcloud CLI
- run: |
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
- name: Deploy to Cloud Run
id: deploy
uses: google-github-actions/deploy-cloudrun@v0
uses: google-github-actions/deploy-cloudrun@v2
with:
service: quadquiz-staging
region: us-east4
Expand Down
21 changes: 0 additions & 21 deletions config/config.exs
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,6 @@ config :logger, :console,
# Use Jason for JSON parsing in Phoenix
config :phoenix, :json_library, Jason

# Google authentication configuration
config :ueberauth, Ueberauth,
providers: [
google:
{Ueberauth.Strategy.Google, [default_scope: "email profile", allow_private_emails: true]}
]

config :ueberauth, Ueberauth.Strategy.Google.OAuth,
client_id: "",
client_secret: ""

# Linkedin authentication configuration
config :ueberauth, Ueberauth,
providers: [
linkedin: {Ueberauth.Strategy.LinkedIn, [default_scope: "r_liteprofile r_emailaddress"]}
]

config :ueberauth, Ueberauth.Strategy.LinkedIn.OAuth,
client_id: "",
client_secret: ""

# Github authentication configuration
config :ueberauth, Ueberauth,
providers: [
Expand Down
2 changes: 1 addition & 1 deletion courses/course_one/chapter_one/sbom/001.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Comply to Connect
The focus of the October-2020
Cybersecurity Automation Workshop (CAW)
Cybersecurity Automation Village
was the "comply to connect" use case:

![lec](/images/comply2connect.png)
Expand Down
33 changes: 0 additions & 33 deletions courses/course_one/chapter_three/005.md

This file was deleted.

33 changes: 0 additions & 33 deletions courses/course_one/chapter_two/005.md

This file was deleted.

33 changes: 0 additions & 33 deletions courses/course_three/chapter_one/001.md

This file was deleted.

34 changes: 0 additions & 34 deletions courses/course_three/chapter_one/002.md

This file was deleted.

33 changes: 0 additions & 33 deletions courses/course_three/chapter_one/005.md

This file was deleted.

33 changes: 0 additions & 33 deletions courses/course_three/chapter_three/001.md

This file was deleted.

34 changes: 0 additions & 34 deletions courses/course_three/chapter_three/002.md

This file was deleted.

33 changes: 0 additions & 33 deletions courses/course_three/chapter_three/005.md

This file was deleted.

Loading

0 comments on commit 5c0486a

Please sign in to comment.