Skip to content

Commit

Permalink
Merge branch 'main' into run_error_strip_refresh
Browse files Browse the repository at this point in the history
  • Loading branch information
pseudomorph authored May 10, 2024
2 parents ea43c47 + fb036d0 commit 1df0e9f
Show file tree
Hide file tree
Showing 21 changed files with 522 additions and 4,369 deletions.
11 changes: 3 additions & 8 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,8 @@
},
packageRules: [
{
matchPackageNames: [
'vuepress',
'@vuepress/client',
'@vuepress/markdown',
'@vuepress/utils',
],
groupName: 'vuepress',
allowedVersions: '!/pre.*$/',
"matchFileNames": ["package.json"],
"enabled": false
},
{
matchFileNames: [
Expand Down Expand Up @@ -105,6 +99,7 @@
customType: 'regex',
fileMatch: [
'.circleci/config.yml$',
'^\\.github/workflows/[^/]+\\.ya?ml$',
],
matchStrings: [
'renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s.*?_VERSION: (?<currentValue>.*)\\s',
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3
uses: github/codeql-action/init@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -85,7 +85,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, 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@d39d31e687223d841ef683f52467bd88e9b21c14 # v3
uses: github/codeql-action/autobuild@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -98,7 +98,7 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3
uses: github/codeql-action/analyze@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3
with:
category: "/language:${{matrix.language}}"

Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/pr-size-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: pr-size

on: [pull_request]

jobs:
labeler:
runs-on: ubuntu-latest
name: Label the PR size
steps:
- uses: codelytv/pr-size-labeler@54ef36785e9f4cb5ecf1949cfc9b00dbb621d761 # v1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
xs_label: 'size/xs'
xs_max_size: '10'
s_label: 'size/s'
s_max_size: '200'
m_label: 'size/m'
m_max_size: '1000'
l_label: 'size/l'
l_max_size: '10000'
xl_label: 'size/xl'
fail_if_xl: 'false'
message_if_xl: >
This PR exceeds the recommended size of 1000 lines.
Please make sure you are NOT addressing multiple issues with one PR.
Note this PR might be rejected due to its size.
github_api_url: 'https://api.github.com'
files_to_ignore: ''
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ output
.cover
.terraform/
node_modules/
**/.vuepress/*
helm/test-values.yaml
*.swp
golangci-lint
Expand All @@ -27,3 +26,12 @@ tmp-CHANGELOG.md

# IDE files
*.code-workspace

# draw.io backup files
*.bkp

# vuepress
**/.vuepress/*
!runatlantis.io/.vuepress/config.*
!runatlantis.io/.vuepress/navbar.*
!runatlantis.io/.vuepress/sidebar.*
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.12.2
20.13.1
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ require (
github.com/hashicorp/go-version v1.6.0
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72
github.com/jpillora/backoff v1.0.0
github.com/kr/pretty v0.3.1
github.com/mcdafydd/go-azuredevops v0.12.1
github.com/microcosm-cc/bluemonday v1.0.26
Expand Down
1 change: 1 addition & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+h
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
Expand Down
33 changes: 33 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Netlify Config, https://www.netlify.com/docs/netlify-toml-reference/
[build]
base = "/"
publish = "runatlantis.io/.vuepress/dist/"
command = "pnpm website:build"

[[redirects]]
from = "/guide/getting-started.html"
to = "/guide/"
status = 301
force = true

[[redirects]]
from = "/docs/atlantis-yaml-reference.html"
to = "/docs/repo-level-atlantis-yaml.html"
status = 301
force = true

[[headers]]
for = "/*"
[headers.values]
X-Frame-Options = "DENY"
X-XSS-Protection = "1; mode=block"
Content-Security-Policy = "default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:"
Cache-Control = "public, max-age=86400, must-revalidate"
Strict-Transport-Security = "max-age=86400; includeSubDomains; preload"
Referrer-Policy = "no-referrer"
X-Content-Type-Options = "nosniff"

[[headers]]
for = "*.html"
[headers.values]
Content-Type = "text/html; charset=UTF-8"
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"devDependencies": {
"@playwright/test": "^1.44.0",
"@vuepress/bundler-webpack": "2.0.0-rc.9",
"@vuepress/plugin-docsearch": "2.0.0-rc.27",
"@vuepress/plugin-docsearch": "2.0.0-rc.21",
"@vuepress/plugin-google-analytics": "2.0.0-rc.21",
"@vuepress/plugin-sitemap": "2.0.0-rc.26",
"@vuepress/theme-default": "2.0.0-rc.24",
"@vuepress/plugin-sitemap": "2.0.0-rc.21",
"@vuepress/theme-default": "2.0.0-rc.21",
"@vuepress/utils": "2.0.0-rc.9",
"sass-loader": "14.1.1",
"vue": "3.4.21",
"sass-loader": "14.2.1",
"vue": "3.4.27",
"vuepress": "2.0.0-rc.9"
},
"scripts": {
"website:dev": "vuepress dev runatlantis.io",
"website:dev": "vuepress dev --host localhost runatlantis.io",
"website:build": "NODE_OPTIONS=--openssl-legacy-provider vuepress build runatlantis.io",
"e2e": "playwright test"
}
Expand Down
Loading

0 comments on commit 1df0e9f

Please sign in to comment.