diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c201b93..9f15ba5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,6 +35,4 @@ jobs: with: name: banner-settings-extension path: | - ${{ github.workspace }}/ado-manifests/* ${{ github.workspace }}/dist/* - ${{ github.workspace }}/static/* diff --git a/.github/workflows/release.job.yml b/.github/workflows/release.job.yml index fd29234..d1295a7 100644 --- a/.github/workflows/release.job.yml +++ b/.github/workflows/release.job.yml @@ -32,7 +32,7 @@ jobs: SHARE_OPTION="--share-with razorspoint-test" fi tfx extension publish \ - --manifests ./artifacts/ado-manifests/azure-devops-extension-base.json \ - --overrides-file ./artifacts/ado-manifests/azure-devops-extension-${{ inputs.env_suffix }}.json \ + --manifests ./artifacts/dist/ado-manifests/azure-devops-extension-base.json \ + --overrides-file ./artifacts/dist/ado-manifests/azure-devops-extension-${{ inputs.env_suffix }}.json \ $SHARE_OPTION \ --token ${{ secrets.azure_devops_token }} diff --git a/webpack.config.js b/webpack.config.js index 1585905..e782335 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -15,7 +15,7 @@ module.exports = (env, argv) => { devtool: argv.mode === 'development' ? 'source-map' : false, output: { filename: "[name]/[name].js", - path: path.join(__dirname, 'dist'), + path: path.join(__dirname, 'dist/dist'), publicPath: "/dist/" }, resolve: { @@ -75,7 +75,12 @@ module.exports = (env, argv) => { plugins: [ new CopyWebpackPlugin({ patterns: [ - { from: "**/*.html", context: "src/" } + { from: "**/*.html", context: "src/", to: "../" }, + { from: "LICENSE", to: "../" }, + { from: "static/*", to: "../" }, + { from: "ado-manifests/azure-devops-extension-base.json", to: "../ado-manifests/" }, + { from: "ado-manifests/azure-devops-extension-test.json", to: "../ado-manifests/" }, + { from: "ado-manifests/azure-devops-extension-prod.json", to: "../ado-manifests/" }, ] }), new MiniCssExtractPlugin({