diff --git a/.github/workflows/unit_tests_enterprise.yml b/.github/workflows/unit_tests_enterprise.yml index cf2a05bc3..e7f79af37 100644 --- a/.github/workflows/unit_tests_enterprise.yml +++ b/.github/workflows/unit_tests_enterprise.yml @@ -36,13 +36,6 @@ jobs: - name: Setup environment run: source ci_scripts/ci_common.sh && setup_github_actions_environment - - - uses: actions/cache@v4 - with: - path: ~/.pkl/cache - key: ${{ runner.os }}-pkl-${{ hashFiles('Secrets/Secrets.pkl') }} - restore-keys: | - ${{ runner.os }}-pkl- - name: Configure Enterprise run: bundle exec fastlane config_element_pro diff --git a/.gitignore b/.gitignore index b3b7e51cd..6f8e3bc47 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,7 @@ build ## macOS Files .DS_Store ._* + +# Only commit Pkl packages (there may be other caches in here). +Secrets/vendor/* +!Secrets/vendor/package-2 diff --git a/Enterprise b/Enterprise index b04686d7c..2c4b038f7 160000 --- a/Enterprise +++ b/Enterprise @@ -1 +1 @@ -Subproject commit b04686d7cb86375527393b1a4ff01cfe9a48deb8 +Subproject commit 2c4b038f7a1c23648b48ffb1ccd6af2e020050f4 diff --git a/Secrets/Secrets.pkl b/Secrets/Secrets.pkl index f314d01c0..3a6e75169 100644 --- a/Secrets/Secrets.pkl +++ b/Secrets/Secrets.pkl @@ -7,7 +7,7 @@ // Analytics and Diagnostics -import "package://pkg.pkl-lang.org/github.com/element-hq/pkl-tools/staticcode@1.0.0#/StaticCode.pkl" +import "package://pkg.pkl-lang.org/github.com/element-hq/pkl-tools/staticcode@1.0.1#/StaticCode.pkl" sentryDSN: String? = read?("env:SENTRY_DSN") postHogHost: String? = read?("env:POSTHOG_HOST") diff --git a/Secrets/vendor/package-2/pkg.pkl-lang.org/github.com/element-hq/pkl-tools/staticcode@1.0.1/staticcode@1.0.1.json b/Secrets/vendor/package-2/pkg.pkl-lang.org/github.com/element-hq/pkl-tools/staticcode@1.0.1/staticcode@1.0.1.json new file mode 100644 index 000000000..cf6621831 --- /dev/null +++ b/Secrets/vendor/package-2/pkg.pkl-lang.org/github.com/element-hq/pkl-tools/staticcode@1.0.1/staticcode@1.0.1.json @@ -0,0 +1,11 @@ +{ + "name": "staticcode", + "packageUri": "package://pkg.pkl-lang.org/github.com/element-hq/pkl-tools/staticcode@1.0.1", + "version": "1.0.1", + "packageZipUrl": "https://github.com/element-hq/pkl-tools/releases/download/staticcode@1.0.1/staticcode@1.0.1.zip", + "packageZipChecksums": { + "sha256": "4f89837d86c6228620cb1986bb7dd19fec8665a5932fca18348204f24ba3f004" + }, + "dependencies": {}, + "authors": [] +} \ No newline at end of file diff --git a/Secrets/vendor/package-2/pkg.pkl-lang.org/github.com/element-hq/pkl-tools/staticcode@1.0.1/staticcode@1.0.1.zip b/Secrets/vendor/package-2/pkg.pkl-lang.org/github.com/element-hq/pkl-tools/staticcode@1.0.1/staticcode@1.0.1.zip new file mode 100644 index 000000000..803dd5f97 Binary files /dev/null and b/Secrets/vendor/package-2/pkg.pkl-lang.org/github.com/element-hq/pkl-tools/staticcode@1.0.1/staticcode@1.0.1.zip differ diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 1ddd7d70d..311f0fefc 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -429,6 +429,6 @@ end lane :config_secrets do Dir.chdir "../Secrets" do - sh("pkl eval -o Secrets.swift Secrets.pkl") + sh("pkl eval --cache-dir vendor -o Secrets.swift Secrets.pkl") end end