T340226 reproducible builds (#517)

.dockerignore

@@ -1,7 +1,3 @@
-# comment
-cache/*
-git_cache/*
-Docker/**/*.tar.gz
 test/suites/**/results
 test/log
 test/mwlog

.github/actions/upload-results/action.yml

@@ -9,23 +9,18 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Archive build_metadata Artifacts (if any)
-      uses: actions/upload-artifact@v3
-      with:
-        name: Metadata
-        path: artifacts/build_metadata_*.env
-        if-no-files-found: ignore
-
     - name: Archive tar artifacts (if any)
       uses: actions/upload-artifact@v3
       with:
         name: TarBalls
-        path: artifacts/${{ inputs.component }}.tar.gz
+        path: |
+          artifacts/${{ inputs.component }}*.tar.gz
+          !artifacts/${{ inputs.component }}*.docker.tar.gz
         if-no-files-found: ignore
 
     - name: Archive Docker artifact
       uses: actions/upload-artifact@v3
       with:
         name: DockerImages
-        path: artifacts/${{ inputs.component }}.docker.tar.gz
+        path: artifacts/${{ inputs.component }}*.docker.tar.gz
         if-no-files-found: error

.github/workflows/build_and_test.yml

@@ -46,25 +46,15 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v4
 
-      - name: Prepare environment and caches
-        uses: ./.github/actions/prep-env-and-cache
-
       - name: Build
-        run: ./build.sh ${{ matrix.component }}
+        run: ./build.sh --save-image --extract-tarball ${{ matrix.component }}
         shell: bash
 
       - name: Upload results
         uses: ./.github/actions/upload-results
         with:
           component: ${{ matrix.component }}
 
-      # TODO: remove extra step with https://phabricator.wikimedia.org/T347000
-      - name: Upload additional bundle results for wikibase build
-        if: matrix.component == 'wikibase'
-        uses: ./.github/actions/upload-results
-        with:
-          component: ${{ matrix.component }}-bundle
-
       - name: Scan Image
         uses: ./.github/actions/scan-image
         continue-on-error: true
@@ -213,7 +203,7 @@ jobs:
         ]
 
     env:
-      TARGET_WIKIBASE_UPGRADE_IMAGE_NAME: wikibase-bundle
+      TARGET_WIKIBASE_UPGRADE_IMAGE_NAME: wikibase/wikibase-bundle
 
     steps:
       - uses: actions/checkout@v4
@@ -242,36 +232,6 @@ jobs:
           name: TestResults
           path: test/suites/**/results
 
-  # TODO: https://phabricator.wikimedia.org/T347084
-  metadata:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs:
-      - test
-
-    strategy:
-      fail-fast: false
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: c-py/action-dotenv-to-setenv@v4
-        with:
-          env-file: "variables.env"
-
-      - name: Build version requirements
-        shell: bash
-        run: |
-          ./build.sh requirements
-
-      - name: Archive metadata artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: Metadata
-          path: artifacts/built_versions.log
-          if-no-files-found: error
-
   upload_ghcr:
     runs-on: ubuntu-latest
     timeout-minutes: 20

.gitignore

@@ -1,24 +1,10 @@
-core
-Vector
-cache
-git_cache
-container_id
 *.swp
-Wikibase.tar.gz
-*.docker.tar.gz
-
-Docker/build/Wikibase/artifacts
-
-Docker/build/WDQS/wait-for-it.sh
-
-#temp 
-Docker/**/*.tar.gz
-test/suites/**/results/
-test/log
-test/mwlog
-docs/diagrams/node_modules/
-artifacts/*
-local.env
-example/log
 .DS_Store
 .direnv
+artifacts/*
+docs/diagrams/node_modules/
+example/log
+local.env
+test/log
+test/mwlog
+test/suites/**/results/