Updating PR conflicts

.github/ISSUE_TEMPLATE/improve-docs.yml → .github/ISSUE_TEMPLATE/a-improve-docs.yml

@@ -39,4 +39,4 @@ body:
       label: Additional information
       description: Add any other context or screenshots about the feature request here.
     validations:
-      required: false
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,5 @@
 blank_issues_enabled: true
 contact_links:
-  - name: Want to see new content? Open a discussion!
-    url: https://github.com/dbt-labs/docs.getdbt.com/discussions/new
-    about: You can open a discussion to propose new content for the dbt product documentation.
   - name: Have questions about dbt? Join the Community!
     url: https://www.getdbt.com/community/join-the-community
     about: You can join the dbt Labs Community to ask and answer questions.

.github/ISSUE_TEMPLATE/contribute-to-developer-blog.yml

@@ -1,4 +1,4 @@
-name: Contribute to the dbt Developer Blog
+name: Propose a dbt Developer Blog idea
 description: >
   For proposing a new post on the dbt Developer Blog.
 labels: ["content","developer blog"]

.github/ISSUE_TEMPLATE/improve-the-site.yml

@@ -1,6 +1,6 @@
-name: Improve the docs.getdbt.com site
-description: Make a suggestion or report a problem about the technical implementation of docs.getdbt.com.
-labels: ["engineering"]
+name: Report a docs.getdbt.com site issue
+description: Report a problem about the technical implementation of docs.getdbt.com.
+labels: ["engineering","bug"]
 body:
   - type: markdown
     attributes:
@@ -39,4 +39,4 @@ body:
       label: Additional information
       description: Any additional information, configuration, or data that might be necessary to reproduce the issue.
     validations:
-      required: false
+      required: false

.github/ISSUE_TEMPLATE/zzz_add-adapter-to-trusted-list.yml

@@ -0,0 +1,62 @@
+name: Add adapter to Trusted list
+description: For adapter maintainers who wish to have theirs added to the list of Trusted adapters.
+title: "Trust dbt-myadapter"
+labels: ["adapter maintainers"]
+assignees:
+  - dataders
+body:
+  - type: markdown
+    attributes:
+      value: |
+        We're excited that you'd like to support your adapter formally as "Trusted"! This template will ensure that you are aware of the process and the guidelines. Additionally, that you can vouch that your adapter currently meets the standards of a Trusted adapter. For more information, see [Trusted adapters](https://docs.getdbt.com/docs/trusted-adapters)
+
+  - type: input
+    id: adapter-repo
+    attributes:
+      label: Link to adapter repo
+      description: Please link to the GitHub repo
+    validations:
+      required: true
+
+  - type: input
+    id: contact
+    attributes:
+      label: Contact Details
+      description: How can we get in touch with you?
+      placeholder: your preferred email and/or dbt Slack handle
+    validations:
+      required: true
+
+  - type: dropdown
+    id: author_type
+    attributes:
+      label: Which of these best describes you?
+      options:
+        - I am a dbt Community member
+        - I work for the vendor on top of which the dbt adapter functions
+    validations:
+      required: true
+
+  - type: checkboxes
+    id: read-program-guide
+    attributes:
+      label: Please agree to the each of the following
+      options:
+        - label: I am a maintainer of the adapter being submited for Trusted status
+          required: true
+        - label: I have read both the [Trusted adapters](https://docs.getdbt.com/docs/trusted-adapters) and [Building a Trusted Adapter](https://docs.getdbt.com/guides/dbt-ecosystem/adapter-development/8-building-a-trusted-adapter) pages.
+          required: true
+        - label: I believe that the adapter currently meets the expectations given above
+          required: true
+        - label: I will ensure this adapter stays in compliance with the guidelines
+          required: true
+        - label: I understand that dbt Labs reserves the right to remove an adapter from the trusted adapter list at any time, should any of the below guidelines not be met
+          required: true
+
+  - type: textarea
+    id: icon
+    attributes:
+      label: What icon should be used?
+      description: |
+        Please share an svg image that you'd like to be displayed in for your adapter. Normally, this is the logo for the data platform on top of which your adapter works. If there's a dark mode version, please also share that.
+        Pasting the image from your clipboard will upload the file to GitHub and create markdown formatting for it to be rendered inline

.github/workflows/autogenerated_labeler.yml

@@ -0,0 +1,40 @@
+# **what?**
+# Labels issues autogenerated in dbt-core
+
+# **why?**
+# To organize autogenerated issues from dbt-core to make it easier to find and track them.
+
+# **when?**
+# When an issue is opened by the FishtownBuildBot
+
+name: Add Labels to Autogenerated Issues
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  add_customized_labels:
+    if: github.event.issue.user.login == 'FishtownBuildBot'
+    permissions:
+      issues: write
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Determine appropriate labels by repo in title"
+        id: repo
+        env:
+          ISSUE_TITLE: ${{ github.event.issue.title }}
+        run: |
+          if [[ "$ISSUE_TITLE" == *"dbt-core"* ]]; then
+            echo "labels='content,improvement,dbt Core'" >> $GITHUB_OUTPUT
+          else
+            echo "labels='content,improvement,adapters'" >> $GITHUB_OUTPUT
+          fi
+
+      - name: "Add Labels to autogenerated Issues"
+        id: add-labels
+        run: |
+          gh issue edit ${{ github.event.issue.number }} --repo ${{ github.repository }} --add-label ${{ steps.repo.outputs.labels }}
+        env:
+          GH_TOKEN: ${{ secrets.DOCS_SECRET }}

.github/workflows/label.yml

@@ -2,7 +2,7 @@ name: Add/Remove Labels
 
 on:
   pull_request_target:
-    types: [ opened, closed ]
+    types: [ opened ]
 
 jobs:
   add_new_contributor_label:
@@ -15,24 +15,32 @@ jobs:
       - uses: actions/github-script@v6
         with:
           script: |
-            const creator = context.payload.sender.login
+            const creator = context.payload.sender.login;
             const opts = github.rest.issues.listForRepo.endpoint.merge({
               ...context.issue,
               creator,
-              state: 'all'
-            })
-            const issues = await github.paginate(opts)
+              state: 'all',
+            });
+            
+            const issues = await github.paginate(opts);
+            
+            let isAlreadyContributor = false;
+            
             for (const issue of issues) {
               if (issue.number === context.issue.number) {
-                continue
+                continue;
               }
-              if (issue.pull_request) {
-                return // creator is already a contributor
+              if (issue.pull_request && issue.user.login === creator) {
+                isAlreadyContributor = true;
+                break;
               }
             }
-            await github.rest.issues.addLabels({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              labels: ['new contributor']
-            })
+            
+            if (!isAlreadyContributor) {
+              await github.rest.issues.addLabels({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                labels: ['new contributor'],
+              });
+            }

.gitignore

@@ -11,10 +11,14 @@ website/yarn.lock
 website/node_modules
 website/i18n/*
 
-# Local vs code 
+# IDE configs
 .vscode
+.idea
+
 # Local Netlify folder
 .netlify
 
-.vscode
 .eslintcache
+
+# Local Vercel folder
+.vercel

README.md

@@ -42,7 +42,7 @@ You can add code snippets and other content in a tabbed view. To learn more abou
 
 # Running the Docs site locally
 
-You can click a link available in a netlify bot PR comment to see and review your changes rendered on a staging server. You are also able to see and review your proposed modifications locally on your computer. Our setup instructions use [homebrew](https://brew.sh/):
+You can click a link available in a Vercel bot PR comment to see and review your changes rendered on a staging server. You are also able to see and review your proposed modifications locally on your computer. Our setup instructions use [homebrew](https://brew.sh/):
 
 ## Prerequisites