Merge pull request #1117 from Atlas-OS/dev

Co-authored-by: he3als <[email protected]> Co-authored-by: atlasos-admin <[email protected]> Co-authored-by: thePineapple <[email protected]>
Atlas-OS · Jun 10, 2024 · 80df24e · 80df24e
2 parents 716596b + d630f5c
commit 80df24e
Show file tree

Hide file tree

Showing 25 changed files with 445 additions and 551 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,72 +1,79 @@
 name: Bug report
 description: Create a bug report to help us improve Atlas.
-labels: bug
 title: "[BUG] - "
-body:
-  - type: markdown
-    attributes:
-      value: |
-       Before submitting an issue, please ensure you have completed the following steps:
-       - Searched our [documentation](https://docs.atlasos.net)
-       - Searched our [issue tracker](https://github.com/Atlas-OS/Atlas/issues?q=is%3Aissue) to verify that the issue hasn't been reported already
-       - Confirmed that you are on the latest version of Atlas
 
-       Please note, by submitting an issue, you acknowledge that if the above steps have not been followed, the maintainers reserve the right to close and lock your issue without further response.
-  - type: textarea
-    attributes:
-      label: Description
-      description: A short description of the bug.
-    validations:
-      required: true
+labels: 
+- bug
 
-  - type: textarea
-    attributes:
-      label: Steps to reproduce
-      description: The steps required to reproduce this bug (add screenshots if applicable).
-      placeholder: |
-        1. [First step] (Screenshot 1)
-        2. [Second step] (Screenshot 2)
-        3. [And so on...] (Screenshot X)
-    validations:
+body:
+- type: checkboxes
+  attributes:
+    label: Before continuing...
+    description: Please ensure you meet the following criteria. If not, the maintainers reserve the right to close and lock your issue.
+    options:
+    - label: "I agree to follow Atlas' [Code of Conduct](https://github.com/Atlas-OS/.github/blob/main/profile/CODE_OF_CONDUCT.md)"
       required: true
-
-  - type: textarea
-    attributes:
-      label: Expected behavior
-      description: What you expect to happen (add screenshots if applicable).
-    validations:
+    - label: "I have searched our [issue tracker](https://github.com/Atlas-OS/Atlas/issues?q=is%3Aissue) to verify that the issue hasn't been reported already"
       required: true
-
-  - type: textarea
-    attributes:
-      label: Actual behavior
-      description: What actually happened (add screenshots if applicable).
-    validations:
+    - label: "I have searched the [Atlas documentation](https://docs.atlasos.net) beforehand for a solution"
       required: true
-
-  - type: dropdown
-    attributes:
-      label: Atlas Edition
-      options:
-        - Atlas for Windows 10 22H2
-        - Atlas for Windows 11 23H2
-    validations:
+    - label: "I am on the latest version of Atlas, and didn't do an unsupported upgrade"
       required: true
 
-  - type: textarea
-    attributes:
-      label: Desktop information
-      description: Your hardware specification is needed for us to define the problem.
-      placeholder: |
-       - Processor [include brand and specs]
-       - RAM [include size and generation]
-       - Storage [include size, brand, and type]
-       - GPU [include brand, specs, driver version]
-    validations:
-      required: true
+- type: textarea
+  attributes:
+    label: Description
+    description: A short description of the bug.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Steps to reproduce
+    description: The steps required to reproduce this bug (add screenshots if applicable).
+    placeholder: |
+      1. [First step] (Screenshot 1)
+      2. [Second step] (Screenshot 2)
+      3. [And so on...] (Screenshot X)
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Expected behavior
+    description: What you expect to happen (add screenshots if applicable).
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Actual behavior
+    description: What actually happened (add screenshots if applicable).
+  validations:
+    required: true
+
+- type: dropdown
+  attributes:
+    label: Atlas Edition
+    options:
+    - Atlas for Windows 10 22H2
+    - Atlas for Windows 11 23H2
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Desktop information
+    description: Your hardware specification is needed for us to define the problem.
+    placeholder: |
+      - Processor [include brand and specs]
+      - RAM [include size and generation]
+      - Storage [include size, brand, and type]
+      - GPU [include brand, specs, driver version]
+  validations:
+    required: true
 
-  - type: textarea
-    attributes:
-      label: Additional content
-      description: Anything you want to add.
-    validations:
+- type: textarea
+  attributes:
+    label: Additional content
+    description: Anything you want to add.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Report Issue about Atlas Documentation
+  - name: Report an issue about the Atlas Documentation
     url: https://github.com/Atlas-OS/docs/issues/
-    about: Report all Documentation issues in our Documentation repository issue tracker.
-  - name: Report an issue (non-Atlas related issue)
+    about: Report all documentation issues in our 'docs' repository issue tracker.
+  - name: Report a non-Atlas related issue
     url: https://forum.atlasos.net/t/atlas-bug-report
-    about: Please report any non-Atlas Playbook related issue in the ``Bug Report`` section on our Forum (Website, Discord bot, etc.).
+    about: Please report any non-Atlas Playbook related issue in the 'Bug Report' section on our forum (website, Discord bot, etc.).
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,52 +1,58 @@
 name: Feature request
 description: Create a feature request to help us improve Atlas.
-labels: enhancement
 title: "[FEATURE] - "
-body:
-  - type: markdown
-    attributes:
-      value: |
-       Before submitting an feature request, please ensure you have completed the following steps:
-       - The request you submit is related to the Atlas Playbook. If not, request it in our [forum](https://forum.atlasos.net/t/general)
-       - Searched our [issue tracker](https://github.com/Atlas-OS/Atlas/issues?q=is%3Aissue) to verify that the issue hasn't been reported already
-       - Confirmed that your issue is not a support request
-       - Confirmed that your idea is not already in the latest version of Atlas
 
-       Please note, by submitting an issue, you acknowledge that if the above steps have not been followed, the maintainers reserve the right to close and lock your issue without further response.
-  - type: dropdown
-    attributes:
-      label: What is your feature request regarding to?
-      options:
-        - Atlas Playbook
-        - Other (submit it in https://forum.atlasos.net)
-    validations:
-      required: true
+labels:
+- enhancement
 
-  - type: textarea
-    attributes:
-      label: Is your feature request related to a problem? Please describe.
-      placeholder: |
-        e.g. I always wanted Atlas to...
-    validations:
+body:
+- type: checkboxes
+  attributes:
+    label: Before continuing...
+    description: Please ensure you meet the following criteria. If not, the maintainers reserve the right to close and lock your issue.
+    options:
+    - label: "I agree to follow Atlas' [Code of Conduct](https://github.com/Atlas-OS/.github/blob/main/profile/CODE_OF_CONDUCT.md)"
       required: true
-
-  - type: textarea
-    attributes:
-      label: Describe the solution you would like.
-      placeholder: |
-        e.g. I would like Atlas to add...
-    validations:
+    - label: "I have searched our [issue tracker](https://github.com/Atlas-OS/Atlas/issues?q=is%3Aissue) to verify that the issue hasn't been reported already"
       required: true
-
-  - type: textarea
-    attributes:
-      label: Describe alternatives you have considered.
-      description: If you have found a temporary fix, list it here.
-    validations:
+    - label: "I have searched the [Atlas documentation](https://docs.atlasos.net) beforehand for a solution"
       required: true
+    - label: "I am on the latest version of Atlas, and didn't do an unsupported upgrade"
+      required: true
+
+- type: dropdown
+  attributes:
+    label: What is your feature request regarding to?
+    options:
+    - Atlas Playbook
+    - Other (submit it in https://forum.atlasos.net)
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Is your feature request related to a problem? Please describe.
+    placeholder: |
+      e.g. I always wanted Atlas to...
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Describe the solution you would like.
+    placeholder: |
+      e.g. I would like Atlas to add...
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Describe alternatives you have considered.
+    description: If you have found a temporary fix, list it here.
+  validations:
+    required: true
 
-  - type: textarea
-    attributes:
-      label: Additional context.
-      description: Add any other context or screenshots about the feature request here.
-    validations:
+- type: textarea
+  attributes:
+    label: Additional context.
+    description: Add any other context or screenshots about the feature request here.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -11,17 +11,21 @@ playbook:
 - src/**/*
 
 appx:
-- src/Configuration/features/atlas/appx.yml
+- src/Configuration/atlas/appx.yml
 
 components:
-- src/Configuration/features/atlas/components.yml
-- src/Configuration/features/atlas/packages.yml
+- src/Configuration/atlas/components.yml
+- src/Configuration/atlas/packages.yml
 
 config:
-- src/Configuration/features/atlas/config.yml
+- src/Configuration/atlas/config.yml
 
 services:
-- src/Configuration/features/atlas/services.yml
+- src/Configuration/atlas/services.yml
+
+tweaks:
+- src/Configuration/tweaks.yml
+- src/Configuration/tweaks/**/*
 
 desktop folder:
-- src/Executables/Atlas/**/*
+- src/Executables/AtlasDesktop/**/*
diff --git a/.github/workflows/apbx.yaml b/.github/workflows/apbx.yaml
@@ -3,13 +3,15 @@ name: Create and Validate Atlas Playbook
 on:
   push:
     paths:
-      - "src/**"
+      - "src/playbook/**"
+      - "**/*.yaml"
+      - "**/*.yml"
 
 env:
   SXSC_REPO: "https://github.com/Atlas-OS/sxsc"
 
 jobs:
-  package-build:
+  build:
     runs-on: windows-latest
 
     steps:
@@ -19,6 +21,9 @@ jobs:
           ref: ${{ github.ref }}
           token: ${{ secrets.RUNNER_SECRET }}
 
+      - name: Validate YAML files
+        run: 'yamllint -d "{extends: relaxed, rules: {empty-lines: disable, line-length: disable, new-line-at-end-of-file: disable, trailing-spaces: disable, new-lines: {type: platform}}}" .'
+
       - name: Get changed files
         id: changed-files
         uses: tj-actions/[email protected]
@@ -105,44 +110,20 @@ jobs:
         working-directory: src\playbook\Executables\AtlasModules\Packages
         if: env.runSxsc == 'true'
 
-  build:
-    needs: package-build
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - name: Validate YAML files
-        run: 'yamllint -d "{extends: relaxed, rules: {empty-lines: disable, line-length: disable, new-line-at-end-of-file: disable, trailing-spaces: disable}}" src/playbook/.'
-
-      - name: Configure playbook
-        id: config-playbook
-        if: ${{ !startsWith(github.ref, 'refs/heads/na-') }}
-        run: |
-          cd src/playbook
-          echo "Making playbook display as unverified (remove ProductCode) so that it is not marked as malicious..."
-          sed -i '/<ProductCode>/d' playbook.conf
-          echo "Change description of playbook..."
-          sed -i 's|<Description>.*<\/Description>|<Description>Experimental testing version of the Atlas Playbook, built with GitHub Actions from commit ${{ github.sha }}. Be aware of these builds being potentially unstable and buggy!</Description>|g' playbook.conf
-          cd Configuration
-          echo "Enabling AME Wizard Live Log..."
-          sed -i '7s/ #//' custom.yml
-      
       - name: Create playbook (ZIP/APBX password is malte)
-        if: ${{ steps.config-playbook.outcome != 'skipped' }}
+        id: create-pb
+        if: ${{ !startsWith(github.ref, 'refs/heads/na-') }}
         run: |
-          cd src/playbook
           echo "Making a renamed password protected (malte) ZIP of playbook files..."
-          zip -r -P malte "Atlas Playbook ${GITHUB_SHA::8}.apbx" . -x "local-build.cmd"
-          echo "Move the .abpx playbook into the 'Release ZIP' to be released as an artifact with the additional files..."
-          mv "Atlas Playbook ${GITHUB_SHA::8}.apbx" "../release-zip"
+          $pbName = "Atlas Playbook $($env:GITHUB_SHA.Substring(0,8))"
+          & ..\local-build.ps1 -ReplaceOldPlaybook -AddLiveLog -Removals Verification, WinverRequirement -FileName $pbName
+          echo "Move the .abpx playbook into 'Release ZIP' to be released as an artifact with the additional files..."
+          Move-Item "$pbName.apbx" "../release-zip"
+        working-directory: src\playbook
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
-        if: ${{ steps.config-playbook.outcome != 'skipped' }}
+        if: ${{ steps.create-pb.outcome != 'skipped' }}
         with:
           name: Atlas Playbook
           path: |