Skip to content

Commit

Permalink
Merge pull request #371 from philgyford/improve-dev-setup
Browse files Browse the repository at this point in the history
Only run CodeQL by cron; add more things to .slugignore; Add missing JS file
  • Loading branch information
philgyford committed Nov 18, 2021
2 parents e677849 + 30ed8da commit f7537bf
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 35 deletions.
64 changes: 32 additions & 32 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
name: "CodeQL"

on:
push:
branches: [ main ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
# push:
# branches: [ main ]
# pull_request:
# # The branches below must be a subset of the branches above
# branches: [ main ]
schedule:
- cron: '17 23 * * 6'
- cron: "17 23 * * 6"

jobs:
analyze:
Expand All @@ -32,39 +32,39 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'javascript', 'python' ]
language: ["javascript", "python"]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

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

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release
#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
9 changes: 7 additions & 2 deletions .slugignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
# Things that don't need to be sent to Heroku
.github
.vscode
/assets
/docker
/tests
devcontainer.json
docker-compose.yml
README.md
run
setup.cfg

# Only used for front-end build locally:
gulpfile.js
package-lock.json
package.json
package.json
yarn.lock
1 change: 1 addition & 0 deletions hines/static/hines/js/admin.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions hines/static/hines/js/site-9230355cc3.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion hines/templates/hines_core/layouts/bare.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

{% block js %}
<!-- inject:js -->
<script src="/static/hines/js/site-ca2c4da7a1.min.js"></script>
<script src="/static/hines/js/site-9230355cc3.min.js"></script>
<!-- endinject -->
{% endblock js %}

Expand Down

0 comments on commit f7537bf

Please sign in to comment.